github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-08 06:00:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix python detection from reigstry when multiple versions are installed. Update fallback mechanism for newer versions.

Browse source
This commit is contained in:
sledgehammer999 2015-06-11 23:45:18 +03:00
parent f3dd93a42c
commit cc8419d344
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/preferences.cpp
View file

@ -1636,7 +1636,7 @@ namespace {
for (DWORD i = 0; i < cSubKeys; ++i) { for (DWORD i = 0; i < cSubKeys; ++i) {
cName = cMaxSubKeyLen; cName = cMaxSubKeyLen;
res = ::RegEnumKeyExW(handle, 0, lpName, &cName, NULL, NULL, NULL, NULL); res = ::RegEnumKeyExW(handle, i, lpName, &cName, NULL, NULL, NULL, NULL);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
keys.push_back(QString::fromWCharArray(lpName)); keys.push_back(QString::fromWCharArray(lpName));
} }
@ -1751,7 +1751,7 @@ QString Preferences::getPythonPath()
// Fallback: Detect python from default locations // Fallback: Detect python from default locations
QStringList supported_versions; QStringList supported_versions;
supported_versions << "32" << "31" << "30" << "27" << "26" << "25"; supported_versions << "34" << "33" << "32" << "31" << "30" << "27" << "26" << "25";
foreach (const QString &v, supported_versions) foreach (const QString &v, supported_versions)
if (QFile::exists("C:/Python" + v + "/python.exe")) if (QFile::exists("C:/Python" + v + "/python.exe"))
return "C:/Python" + v; return "C:/Python" + v;