squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-07 16:12:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11994 from Chocobo1/profile

Browse Source 
Unify singleton pattern in Profile class
This commit is contained in:
Mike Tzou
2020-02-12 23:59:47 +08:00
committed by GitHub
parent 4a2fda7edc 5de75eff05
commit 316f34cbf5
9 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/application.cpp
View File

@@ -149,7 +149,7 @@ Application::Application(const QString &id, int &argc, char **argv)
const QString profileDir = portableModeEnabled
? QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(DEFAULT_PORTABLE_MODE_PROFILE_DIR)
: m_commandLineArgs.profileDir;
Profile::initialize(profileDir, m_commandLineArgs.configurationName,
Profile::initInstance(profileDir, m_commandLineArgs.configurationName,
(m_commandLineArgs.relativeFastresumePaths || portableModeEnabled));
Logger::initInstance();
@@ -177,7 +177,7 @@ Application::Application(const QString &id, int &argc, char **argv)
Logger::instance()->addMessage(tr("Redundant command line flag detected: \"%1\". Portable mode implies relative fastresume.").arg("--relative-fastresume"), Log::WARNING); // to avoid translating the `--relative-fastresume` string
}
else {
Logger::instance()->addMessage(tr("Using config directory: %1").arg(Profile::instance().location(SpecialFolder::Config)));
Logger::instance()->addMessage(tr("Using config directory: %1").arg(Profile::instance()->location(SpecialFolder::Config)));
}
}
@@ -764,6 +764,8 @@ void Application::cleanup()
}
#endif // DISABLE_GUI
Profile::freeInstance();
if (m_shutdownAct != ShutdownDialogAction::Exit) {
qDebug() << "Sending computer shutdown/suspend/hibernate signal...";
Utils::Misc::shutdownComputer(m_shutdownAct);