... and now even when Quassel is QApplication::quit()

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

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index fb0ebdb..e9bb551 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -60,7 +60,7 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
 }
 
 void MainWin::init() {
-  UiSettings s;
+  QtUiSettings s;
   resize(s.value("MainWinSize").toSize());
 
   Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
@@ -110,7 +110,10 @@ void MainWin::init() {
 }
 
 MainWin::~MainWin() {
-
+  QtUiSettings s;
+  s.setValue("MainWinSize", size());
+  s.setValue("MainWinPos", pos());
+  s.setValue("MainWinState", saveState());
 }
 
 void MainWin::setupMenus() {
@@ -332,8 +335,7 @@ void MainWin::showDebugConsole() {
   debugConsole->show();
 }
 
-void MainWin::closeEvent(QCloseEvent *event)
-{
+void MainWin::closeEvent(QCloseEvent *event) {
   QtUiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
     toggleVisibility();
@@ -341,13 +343,6 @@ void MainWin::closeEvent(QCloseEvent *event)
   } else {
     event->accept();
   }
-  //if (userReallyWantsToQuit()) {
-  s.setValue("MainWinSize", size());
-  s.setValue("MainWinPos", pos());
-  s.setValue("MainWinState", saveState());
-  //} else {
-  //  event->ignore();
-  //}
 }
 
 void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {