squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-02 21:52:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correctly concatenate path components

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez)
2022-01-03 19:38:14 +03:00
parent 7e8a176751
commit fdbf8cb0ee
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/application.cpp
View File

@@ -220,7 +220,7 @@ void Application::setFileLoggerEnabled(const bool value)
QString Application::fileLoggerPath() const
{
return m_storeFileLoggerPath.get(specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER);
return m_storeFileLoggerPath.get(QDir(specialFolderLocation(SpecialFolder::Data)).absoluteFilePath(LOG_FOLDER));
}
void Application::setFileLoggerPath(const QString &path)

4
src/app/upgrade.cpp
View File

@@ -74,10 +74,10 @@ namespace
const QString configPath {specialFolderLocation(SpecialFolder::Config)};
migrate(QLatin1String("Preferences/WebUI/HTTPS/Certificate")
, QLatin1String("Preferences/WebUI/HTTPS/CertificatePath")
, Utils::Fs::toNativePath(configPath + QLatin1String("WebUICertificate.crt")));
, Utils::Fs::toNativePath(configPath + QLatin1String("/WebUICertificate.crt")));
migrate(QLatin1String("Preferences/WebUI/HTTPS/Key")
, QLatin1String("Preferences/WebUI/HTTPS/KeyPath")
, Utils::Fs::toNativePath(configPath + QLatin1String("WebUIPrivateKey.pem")));
, Utils::Fs::toNativePath(configPath + QLatin1String("/WebUIPrivateKey.pem")));
}
void upgradeTorrentContentLayout()