Browse Source

BUGFIX : when shutting down the system, qbt simply quits

adaptive-webui-19844
Arnaud Demaiziere 17 years ago
parent
commit
3e13bd1381
  1. 21
      src/GUI.cpp

21
src/GUI.cpp

@ -496,7 +496,7 @@ void GUI::on_actionAbout_triggered() {
// Called when we close the program // Called when we close the program
void GUI::closeEvent(QCloseEvent *e) { void GUI::closeEvent(QCloseEvent *e) {
qDebug("Mainwindow received closeEvent");
QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool(); bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) { if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) {
@ -508,14 +508,16 @@ void GUI::closeEvent(QCloseEvent *e) {
show(); show();
if(!isMaximized()) if(!isMaximized())
showNormal(); showNormal();
if(QMessageBox::question(this, if(e->spontaneous() == true || force_exit == true) {
tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"), if(QMessageBox::question(this,
tr("The download list is not empty.\nAre you sure you want to quit qBittorrent?"), tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
tr("&Yes"), tr("&No"), tr("The download list is not empty.\nAre you sure you want to quit qBittorrent?"),
QString(), 0, 1)) { tr("&Yes"), tr("&No"),
e->ignore(); QString(), 0, 1)) {
force_exit = false; e->ignore();
return; force_exit = false;
return;
}
} }
} }
hide(); hide();
@ -533,6 +535,7 @@ void GUI::closeEvent(QCloseEvent *e) {
qApp->exit(); qApp->exit();
} }
// Display window to create a torrent // Display window to create a torrent
void GUI::on_actionCreate_torrent_triggered() { void GUI::on_actionCreate_torrent_triggered() {
createtorrent *ct = new createtorrent(this); createtorrent *ct = new createtorrent(this);

Loading…
Cancel
Save