Switch over to CoreConnection

[quassel.git] / src / qtui / qtuiapplication.cpp

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 2aa1789..1d80204 100644 (file)
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -56,6 +56,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)
 
 #endif /* HAVE_KDE */
 
+#if defined(HAVE_KDE) || defined(Q_OS_MAC)
+  disableCrashhandler();
+#endif /* HAVE_KDE || Q_OS_MAC */
   setRunMode(Quassel::ClientOnly);
 
   qInstallMsgHandler(Client::logMessage);
@@ -135,7 +138,7 @@ void QtUiApplication::commitData(QSessionManager &manager) {
 
 void QtUiApplication::saveState(QSessionManager & manager) {
   //qDebug() << QString("saving session state to id %1").arg(manager.sessionId());
-  AccountId activeCore = Client::currentCoreAccount(); // FIXME store this!
+  AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this!
   SessionSettings s(manager.sessionId());
   s.setSessionAge(0);
   QtUi::mainWindow()->saveStateToSettings(s);