From e380a17c822d4586518b8170c72d7c47e790db1e Mon Sep 17 00:00:00 2001
From: sledgehammer999 <hammered999@gmail.com>
Date: Tue, 31 Dec 2013 00:33:42 +0200
Subject: [PATCH] Do cleanup work in an earlier stage to ensure correct conf
 saving.

---
 src/mainwindow.cpp | 27 ++++++++++-----------------
 src/mainwindow.h   |  1 -
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a479990fe..c94f57f80 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -337,18 +337,14 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
 }
 
 void MainWindow::deleteBTSession() {
-  guiUpdater->stop();
-  status_bar->stopTimer();
-  QBtSession::drop();
-  m_pwr->setActivityState(false);
-  // Save window size, columns size
-  writeSettings();
-}
-
-// Destructor
-MainWindow::~MainWindow() {
   qDebug("GUI destruction");
   hide();
+  guiUpdater->stop();
+  status_bar->stopTimer();
+  m_pwr->setActivityState(false);
+  QBtSession::drop();
+  // Save window size, columns size
+  writeSettings();
 #ifdef Q_WS_MAC
   // Workaround to avoid bug http://bugreports.qt.nokia.com/browse/QTBUG-7305
   setUnifiedTitleAndToolBarOnMac(false);
@@ -381,15 +377,12 @@ MainWindow::~MainWindow() {
   delete properties;
   delete hSplitter;
   delete vSplitter;
-  if (systrayCreator) {
+  if (systrayCreator)
     delete systrayCreator;
-  }
-  if (systrayIcon) {
+  if (systrayIcon)
     delete systrayIcon;
-  }
-  if (myTrayIconMenu) {
+  if (myTrayIconMenu)
     delete myTrayIconMenu;
-  }
   delete tabs;
   // Keyboard shortcuts
   delete switchSearchShortcut;
@@ -397,7 +390,7 @@ MainWindow::~MainWindow() {
   delete switchTransferShortcut;
   delete switchRSSShortcut;
   IconProvider::drop();
-  qDebug("Exiting GUI destructor...");
+  qDebug("Finished GUI destruction");
 }
 
 void MainWindow::defineUILockPassword() {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 0a8083d24..b1c1b6f53 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -72,7 +72,6 @@ class MainWindow : public QMainWindow, private Ui::MainWindow{
 public:
   // Construct / Destruct
   MainWindow(QWidget *parent=0, const QStringList& torrentCmdLine = QStringList());
-  ~MainWindow();
   // Methods
   QWidget* getCurrentTabWidget() const;
   TransferListWidget* getTransferList() const { return transferList; }