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

Merge pull request #5111 from Chocobo1/refactor_shutdowndlg

Browse source 
Cleanup shutdowndlg
This commit is contained in:
sledgehammer999 2016-04-17 11:23:07 -05:00
commit 2d0b9e6538
10 changed files with 68 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/app/application.cpp
View file

@ -48,7 +48,7 @@
#endif // Q_OS_MAC
#include "mainwindow.h"
#include "addnewtorrentdialog.h"
#include "shutdownconfirm.h"
#include "shutdownconfirmdlg.h"
#else // DISABLE_GUI
#include <iostream>
#endif // DISABLE_GUI
@ -97,7 +97,7 @@ Application::Application(const QString &id, int &argc, char **argv)
: BaseApplication(id, argc, argv)
, m_running(false)
#ifndef DISABLE_GUI
, m_shutdownAct(ShutdownAction::None)
, m_shutdownAct(ShutdownDialogAction::Exit)
#endif
{
Logger::initInstance();
@ -298,15 +298,15 @@ void Application::allTorrentsFinished()
bool shutdown = pref->shutdownWhenDownloadsComplete();
// Confirm shutdown
ShutdownAction action = ShutdownAction::None;
ShutdownDialogAction action = ShutdownDialogAction::Exit;
if (suspend)
action = ShutdownAction::Suspend;
action = ShutdownDialogAction::Suspend;
else if (hibernate)
action = ShutdownAction::Hibernate;
action = ShutdownDialogAction::Hibernate;
else if (shutdown)
action = ShutdownAction::Shutdown;
action = ShutdownDialogAction::Shutdown;
if ((action == ShutdownAction::None) && (!pref->dontConfirmAutoExit())) {
if ((action == ShutdownDialogAction::Exit) && (!pref->dontConfirmAutoExit())) {
if (!ShutdownConfirmDlg::askForConfirmation(action))
return;
}
@ -604,7 +604,7 @@ void Application::cleanup()
shutdownBRDestroy((HWND)m_window->effectiveWinId());
#endif // Q_OS_WIN
delete m_window;
if (m_shutdownAct != ShutdownAction::None) {
if (m_shutdownAct != ShutdownDialogAction::Exit) {
qDebug() << "Sending computer shutdown/suspend/hibernate signal...";
Utils::Misc::shutdownComputer(m_shutdownAct);
}

2
src/app/application.h
View file

@ -114,7 +114,7 @@ private:
#ifndef DISABLE_GUI
QPointer<MainWindow> m_window;
ShutdownAction m_shutdownAct;
ShutdownDialogAction m_shutdownAct;
#endif
#ifndef DISABLE_WEBUI