Fixing some errors seen when account is cleared

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index b819390..7b2d321 100755 (executable)
--- a/src/dialcentral_qt.py
+++ b/src/dialcentral_qt.py
@@ -662,6 +662,7 @@ class MainWindow(qwrappers.WindowWrapper):
        @misc_utils.log_exception(_moduleLogger)
        def _on_account(self, checked = True):
                with qui_utils.notify_error(self._errorLog):
        @misc_utils.log_exception(_moduleLogger)
        def _on_account(self, checked = True):
                with qui_utils.notify_error(self._errorLog):

+                       assert self._session.state == self._session.LOGGEDIN_STATE, "Must be logged in for settings"

                        self._show_account_dialog()
 
 
                        self._show_account_dialog()
 
 

diff --git a/src/session.py b/src/session.py
index a445788..a50245a 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -359,10 +359,13 @@ class Session(QtCore.QObject):
                return self._dnd
 
        def get_account_number(self):
                return self._dnd
 
        def get_account_number(self):

+               if self.state != self.LOGGEDIN_STATE:
+                       return ""

                return self._backend[0].get_account_number()
 
        def get_callback_numbers(self):
                return self._backend[0].get_account_number()
 
        def get_callback_numbers(self):

-               # @todo Remove evilness (might call is_authed which can block)
+               if self.state != self.LOGGEDIN_STATE:
+                       return {}

                return self._backend[0].get_callback_numbers()
 
        def get_callback_number(self):
                return self._backend[0].get_callback_numbers()
 
        def get_callback_number(self):