d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-25 22:14:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix startup with different profiles

Browse Source
This commit is contained in:
jagannatharjun 2021-08-29 20:26:15 +05:30 committed by Vladimir Golovnev (Glassez)
parent 046b741700
commit a734199383
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/base/preferences.cpp
View File

@ -55,9 +55,20 @@
#include "algorithm.h" #include "algorithm.h"
#include "global.h" #include "global.h"
#include "profile.h"
#include "settingsstorage.h" #include "settingsstorage.h"
#include "utils/fs.h" #include "utils/fs.h"
namespace
{
QString makeProfileID(const QString &profilePath, const QString &profileName)
{
return profilePath.isEmpty()
? profileName
: profileName + QLatin1Char('@') + Utils::Fs::toValidFileSystemName(profilePath, false, {});
}
}
Preferences *Preferences::m_instance = nullptr; Preferences *Preferences::m_instance = nullptr;
Preferences::Preferences() = default; Preferences::Preferences() = default;
@ -310,21 +321,31 @@ void Preferences::setPreventFromSuspendWhenSeeding(const bool b)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
bool Preferences::WinStartup() const bool Preferences::WinStartup() const
{ {
QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat); const QString profileName = Profile::instance()->profileName();
return settings.contains("qBittorrent"); const QString profilePath = Profile::instance()->rootPath();
const QString profileID = makeProfileID(profilePath, profileName);
const QSettings settings {"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat};
return settings.contains(profileID);
} }
void Preferences::setWinStartup(const bool b) void Preferences::setWinStartup(const bool b)
{ {
QSettings settings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat); const QString profileName = Profile::instance()->profileName();
const QString profilePath = Profile::instance()->rootPath();
const QString profileID = makeProfileID(profilePath, profileName);
QSettings settings {"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat};
if (b) if (b)
{ {
const QString binPath = '"' + Utils::Fs::toNativePath(qApp->applicationFilePath()) + '"'; const QString configuration = Profile::instance()->configurationName();
settings.setValue("qBittorrent", binPath);
const auto cmd = QString::fromLatin1(R"("%1" "--profile=%2" "--configuration=%3")")
.arg(Utils::Fs::toNativePath(qApp->applicationFilePath()), profilePath, configuration);
settings.setValue(profileID, cmd);
} }
else else
{ {
settings.remove("qBittorrent"); settings.remove(profileID);
} }
} }
#endif // Q_OS_WIN #endif // Q_OS_WIN