Browse Source

Force write settings to disk before exiting.

adaptive-webui-19844
sledgehammer999 11 years ago
parent
commit
f898443e78
  1. 5
      src/headlessloader.h
  2. 5
      src/mainwindow.cpp
  3. 2
      src/mainwindow.h

5
src/headlessloader.h

@ -41,7 +41,7 @@ class HeadlessLoader: public QObject { @@ -41,7 +41,7 @@ class HeadlessLoader: public QObject {
public:
HeadlessLoader(const QStringList &torrentCmdLine) {
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(deleteBTSession()), Qt::DirectConnection);
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(shutdownCleanUp()), Qt::DirectConnection);
Preferences pref;
// Enable Web UI
pref.setWebUiEnabled(true);
@ -63,7 +63,8 @@ public: @@ -63,7 +63,8 @@ public:
}
public slots:
void deleteBTSession() {
void shutdownCleanUp() {
Preferences().sync();
QBtSession::drop();
}

5
src/mainwindow.cpp

@ -110,7 +110,7 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa @@ -110,7 +110,7 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
setWindowTitle(QString("qBittorrent %1").arg(QString::fromUtf8(VERSION)));
displaySpeedInTitle = pref.speedInTitleBar();
// Clean exit on log out
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(deleteBTSession()), Qt::DirectConnection);
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(shutdownCleanUp()), Qt::DirectConnection);
// Setting icons
#if defined(Q_WS_X11)
if (Preferences().useSystemIconTheme())
@ -336,7 +336,7 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa @@ -336,7 +336,7 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
}
}
void MainWindow::deleteBTSession() {
void MainWindow::shutdownCleanUp() {
qDebug("GUI destruction");
hide();
guiUpdater->stop();
@ -390,6 +390,7 @@ void MainWindow::deleteBTSession() { @@ -390,6 +390,7 @@ void MainWindow::deleteBTSession() {
delete switchTransferShortcut;
delete switchRSSShortcut;
IconProvider::drop();
Preferences().sync();
qDebug("Finished GUI destruction");
}

2
src/mainwindow.h

@ -85,7 +85,7 @@ public slots: @@ -85,7 +85,7 @@ public slots:
void downloadFromURLList(const QStringList& urls);
void updateAltSpeedsBtn(bool alternative);
void updateNbTorrents();
void deleteBTSession();
void shutdownCleanUp();
protected slots:
// GUI related slots

Loading…
Cancel
Save