github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 13:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2898 from glassez/app_quit

Browse source 
Fix aboutToQuit signal is not emitted on Windows.
This commit is contained in:
sledgehammer999 2015-04-30 14:28:54 +03:00
commit 452b643e0c
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/gui/mainwindow.cpp
View file

@ -316,6 +316,20 @@ MainWindow::MainWindow(QWidget *parent)
activateWindow(); activateWindow();
raise(); raise();
} }
else {
create();
}
}
else {
// Make sure the Window is visible if we don't have a tray icon
if (pref->startMinimized()) {
showMinimized();
}
else {
show();
activateWindow();
raise();
}
} }
properties->readSettings(); properties->readSettings();
@ -351,18 +365,6 @@ MainWindow::MainWindow(QWidget *parent)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
qt_mac_set_dock_menu(getTrayIconMenu()); qt_mac_set_dock_menu(getTrayIconMenu());
#endif #endif
// Make sure the Window is visible if we don't have a tray icon
if (!systrayIcon) {
if (pref->startMinimized()) {
showMinimized();
}
else {
show();
activateWindow();
raise();
}
}
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -882,6 +884,7 @@ void MainWindow::closeEvent(QCloseEvent *e)
e->accept(); e->accept();
return; return;
} }
if (pref->confirmOnExit() && QBtSession::instance()->hasActiveTorrents()) { if (pref->confirmOnExit() && QBtSession::instance()->hasActiveTorrents()) {
if (e->spontaneous() || force_exit) { if (e->spontaneous() || force_exit) {
if (!isVisible()) if (!isVisible())
@ -905,12 +908,11 @@ void MainWindow::closeEvent(QCloseEvent *e)
Preferences::instance()->setConfirmOnExit(false); Preferences::instance()->setConfirmOnExit(false);
} }
} }
hide(); hide();
if (systrayIcon)
// Hide tray icon // Hide tray icon
if (systrayIcon)
systrayIcon->hide(); systrayIcon->hide();
// Save window size, columns size
writeSettings();
// Accept exit // Accept exit
e->accept(); e->accept();
qApp->exit(); qApp->exit();