X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=1e7e14e667a531914e8a675b30ece918d44dec2d;hb=3ab46c284ac385a0f95a5f5ba5d99a43dc611e6a;hp=49fb897160b32bb424e9a841bc8b7f4e8a49d8cf;hpb=421d659436025fff8c3238e01ab72d550ed11f7b;p=quicknote

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 49fb897..1e7e14e 100644
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -427,10 +427,17 @@ class QuicknoteProgram(hildonize.get_app_class()):
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_destroy(self, widget = None, data = None):
 		try:
-			self._save_settings()
 			self._db.close()
-			if self._osso_c:
+			self._save_settings()
+
+			try:
+				self._deviceState.close()
+			except AttributeError:
+				pass # Either None or close was removed (in Fremantle)
+			try:
 				self._osso_c.close()
+			except AttributeError:
+				pass # Either None or close was removed (in Fremantle)
 		finally:
 			gtk.main_quit()