mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-11 07:18:08 +00:00
Fix torrent association detection on Win32
This commit is contained in:
parent
f242fce5fd
commit
80c42cae1a
@ -1105,12 +1105,14 @@ public:
|
|||||||
|
|
||||||
static bool isFileAssocOk() {
|
static bool isFileAssocOk() {
|
||||||
QSettings settings("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
|
QSettings settings("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
|
||||||
if(settings.value(".torrent\\Default").toString() != "qBittorrent") {
|
if(settings.value(".torrent\\Default").toString() != "qBittorrent" && settings.value(".torrent/Default").toString() != "qBittorrent") {
|
||||||
qDebug(".torrent != qBittorrent");
|
qDebug(".torrent != qBittorrent");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
qDebug("Checking shell command");
|
qDebug("Checking shell command");
|
||||||
QString shell_command = settings.value("qBittorrent\\shell\\open\\command\\Default", "").toString();
|
QString shell_command = settings.value("qBittorrent\\shell\\open\\command\\Default", "").toString();
|
||||||
|
if(shell_command.isEmpty())
|
||||||
|
shell_command = settings.value("qBittorrent/shell/open/command/Default", "").toString();
|
||||||
qDebug("Shell command is: %s", qPrintable(shell_command));
|
qDebug("Shell command is: %s", qPrintable(shell_command));
|
||||||
QRegExp exe_reg("\"([^\"]+)\".*");
|
QRegExp exe_reg("\"([^\"]+)\".*");
|
||||||
if(exe_reg.indexIn(shell_command) < 0)
|
if(exe_reg.indexIn(shell_command) < 0)
|
||||||
@ -1121,6 +1123,8 @@ public:
|
|||||||
return false;
|
return false;
|
||||||
// Check magnet link assoc
|
// Check magnet link assoc
|
||||||
shell_command = settings.value("Magnet\\shell\\open\\command\\Default", "").toString();
|
shell_command = settings.value("Magnet\\shell\\open\\command\\Default", "").toString();
|
||||||
|
if(shell_command.isEmpty())
|
||||||
|
shell_command = settings.value("Magnet/shell/open/command/Default", "").toString();
|
||||||
if(exe_reg.indexIn(shell_command) < 0)
|
if(exe_reg.indexIn(shell_command) < 0)
|
||||||
return false;
|
return false;
|
||||||
assoc_exe = exe_reg.cap(1);
|
assoc_exe = exe_reg.cap(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user