Account: Destroy on exit.

During shutdown we want the account object to be deleted and
therefore we need to be able to remove the strong reference
in AccountManager.

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 289717f4b220149d51825673541bb4b3e5d03d55..0ccbfbc7e2b974bb7ee6b3c01d9f1d74c0d9759f 100644 (file)
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -43,7 +43,9 @@ void AccountStateManager::setAccountState(AccountState *accountState)
         emit accountStateRemoved(_accountState);
     }
     _accountState = accountState;
-    emit accountStateAdded(accountState);
+    if (accountState) {
+        emit accountStateAdded(accountState);
+    }
 }
 
 void AccountStateManager::slotAccountAdded(AccountPtr account)

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 1e554cdcae767077e423734236ed84923fdbd4dd..946384ea1abe42b41f870fb8e0554de6865fe92b 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -180,7 +180,8 @@ Application::Application(int &argc, char **argv) :
 
 Application::~Application()
 {
-    // qDebug() << "* OCC shutdown";
+    // Remove the account from the account manager so it can be deleted.
+    AccountManager::instance()->setAccount(AccountPtr());
 }
 
 void Application::slotLogin()

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 990b482d2b4687de936c556f94977e0e544f3029..14e3ad20208015a89d7d5513d5f49e5b2d195fa7 100644 (file)
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -63,7 +63,9 @@ void AccountManager::setAccount(AccountPtr account)
         emit accountRemoved(_account);
     }
     _account = account;
-    emit accountAdded(account);
+    if (account) {
+        emit accountAdded(account);
+    }
 }