X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=73882abe67912b6e3b481f2760718c2dd98c092d;hp=79f20aa85742385df3eafd2eeb53c1494cfb9fa9;hb=f87b8205ed016355294951608a3220cfba3ca3c7;hpb=ef32decb9e1bdba22b3cf6e16cf7d5650caaf77d

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 79f20aa8..73882abe 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -247,6 +247,7 @@ void MainWin::saveStateToSettings(UiSettings &s) {
   s.setValue("MainWinMinimized", isMinimized());
   s.setValue("MainWinMaximized", isMaximized());
   s.setValue("MainWinHidden", !isVisible());
+  s.setValue("LastUsedBufferId", Client::bufferModel()->currentBuffer().toInt());
 
 #ifdef HAVE_KDE
   saveAutoSaveSettings();
@@ -751,6 +752,12 @@ void MainWin::setConnectedState() {
     IrcConnectionWizard *wizard = new IrcConnectionWizard(this, Qt::Sheet);
     wizard->show();
   }
+  else {
+    QtUiSettings s;
+    BufferId lastUsedBufferId(s.value("LastUsedBufferId").toInt());
+    if(lastUsedBufferId.isValid())
+      Client::bufferModel()->switchToBuffer(lastUsedBufferId);
+  }
 }
 
 void MainWin::loadLayout() {
@@ -1180,4 +1187,3 @@ void MainWin::on_actionDebugLog_triggered() {
 void MainWin::showStatusBarMessage(const QString &message) {
   statusBar()->showMessage(message, 10000);
 }
-