squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 15:07:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix portable mode

Browse Source 
Try to fix portable mode bug. Closes #11706, #11178, #7765.
This commit is contained in:
Tester798
2019-12-29 22:01:02 +02:00
parent 316f34cbf5
commit 58711cbe7e
4 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/base/profile.cpp
View File

@@ -33,13 +33,21 @@
Profile *Profile::m_instance = nullptr;
Profile::Profile(Private::Profile *impl, Private::PathConverter *pathConverter)
: m_profileImpl(impl)
, m_pathConverterImpl(pathConverter)
Profile::Profile(const QString &rootProfilePath, const QString &configurationName, const bool convertPathsToProfileRelative)
{
if (rootProfilePath.isEmpty())
m_profileImpl = std::make_unique<Private::DefaultProfile>(configurationName);
else
m_profileImpl = std::make_unique<Private::CustomProfile>(rootProfilePath, configurationName);
ensureDirectoryExists(SpecialFolder::Cache);
ensureDirectoryExists(SpecialFolder::Config);
ensureDirectoryExists(SpecialFolder::Data);
if (convertPathsToProfileRelative)
m_pathConverterImpl = std::make_unique<Private::Converter>(m_profileImpl->baseDirectory());
else
m_pathConverterImpl = std::make_unique<Private::NoConvertConverter>();
}
void Profile::initInstance(const QString &rootProfilePath, const QString &configurationName,
@@ -47,14 +55,7 @@ void Profile::initInstance(const QString &rootProfilePath, const QString &config
{
if (m_instance)
return;
std::unique_ptr<Private::Profile> profile(rootProfilePath.isEmpty()
? static_cast<Private::Profile *>(new Private::DefaultProfile(configurationName))
: static_cast<Private::Profile *>(new Private::CustomProfile(rootProfilePath, configurationName)));
std::unique_ptr<Private::PathConverter> converter(convertPathsToProfileRelative
? static_cast<Private::PathConverter *>(new Private::Converter(profile->baseDirectory()))
: static_cast<Private::PathConverter *>(new Private::NoConvertConverter()));
m_instance = new Profile(profile.release(), converter.release());
m_instance = new Profile(rootProfilePath, configurationName, convertPathsToProfileRelative);
}
void Profile::freeInstance()