projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Highest sender prefix mode, migrate, fix
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
39b1f38
..
00f8372
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-299,11
+299,7
@@
void MainWin::init()
// restore locked state of docks
QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
// restore locked state of docks
QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
- CoreConnection *conn = Client::coreConnection();
- if (!conn->connectToCore()) {
- // No autoconnect selected (or no accounts)
- showCoreConnectionDlg();
- }
+ QTimer::singleShot(0, this, SLOT(doAutoConnect()));
}
}
@@
-1149,7
+1145,6
@@
void MainWin::setupSystray()
#else
_systemTray = new SystemTray(this); // dummy
#endif
#else
_systemTray = new SystemTray(this); // dummy
#endif
- _systemTray->init();
}
}
@@
-1218,6
+1213,15
@@
void MainWin::saveMainToolBarStatus(bool enabled)
}
}
+void MainWin::doAutoConnect()
+{
+ if (!Client::coreConnection()->connectToCore()) {
+ // No autoconnect selected (or no accounts)
+ showCoreConnectionDlg();
+ }
+}
+
+
void MainWin::connectedToCore()
{
Q_CHECK_PTR(Client::bufferViewManager());
void MainWin::connectedToCore()
{
Q_CHECK_PTR(Client::bufferViewManager());