From bd97a4bd7c408a01840f52cb2801a373e1b55f7b Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 14 Jun 2010 12:51:07 +0000 Subject: [PATCH] Fix registry access on 64bits windows --- src/preferences.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/preferences.h b/src/preferences.h index 01117c68b..88f7f5d06 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -1041,12 +1041,12 @@ public: static bool isFileAssocOk() { QSettings settings("HKEY_CLASSES_ROOT", QSettings::NativeFormat); - if(settings.value(".torrent/Default").toString() != "qBittorrent") { + if(settings.value(".torrent\\Default").toString() != "qBittorrent") { qDebug(".torrent != qBittorrent"); return false; } 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(); qDebug("Shell command is: %s", qPrintable(shell_command)); QRegExp exe_reg("\"([^\"]+)\".*"); if(exe_reg.indexIn(shell_command) < 0) @@ -1056,7 +1056,7 @@ public: if(assoc_exe.compare(qApp->applicationFilePath().replace("/", "\\"), Qt::CaseInsensitive) != 0) return false; // 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(exe_reg.indexIn(shell_command) < 0) return false; assoc_exe = exe_reg.cap(1); @@ -1069,21 +1069,21 @@ public: static void setFileAssoc() { QSettings settings("HKEY_CLASSES_ROOT", QSettings::NativeFormat); // .Torrent association - settings.setValue(".torrent/Default", "qBittorrent"); - settings.setValue(".torrent/Content Type", "application/x-bittorrent"); - settings.setValue("qBittorrent/shell/Default", "open"); + settings.setValue(".torrent\\Default", "qBittorrent"); + settings.setValue(".torrent\\Content Type", "application/x-bittorrent"); + settings.setValue("qBittorrent\\shell\\Default", "open"); const QString command_str = "\""+qApp->applicationFilePath().replace("/", "\\")+"\" \"%1\""; - settings.setValue("qBittorrent/shell/open/command/Default", command_str); - settings.setValue("qBittorrent/Content Type/Default", "application/x-bittorrent"); + settings.setValue("qBittorrent\\shell\\open\\command\\Default", command_str); + settings.setValue("qBittorrent\\Content Type\\Default", "application/x-bittorrent"); const QString icon_str = "\""+qApp->applicationFilePath().replace("/", "\\")+"\",0"; - settings.setValue("qBittorrent/DefaultIcon/Default", icon_str); + settings.setValue("qBittorrent\\DefaultIcon\\Default", icon_str); // Magnet association - settings.setValue("Magnet/Default", "Magnet URI"); - settings.setValue("Magnet/Content Type", "application/x-magnet"); - settings.setValue("Magnet/URL Protocol", ""); - settings.setValue("Magnet/DefaultIcon/Default", icon_str); - settings.setValue("Magnet/shell/Default", "open"); - settings.setValue("Magnet/shell/open/command/Default", command_str); + settings.setValue("Magnet\\Default", "Magnet URI"); + settings.setValue("Magnet\\Content Type", "application/x-magnet"); + settings.setValue("Magnet\\URL Protocol", ""); + settings.setValue("Magnet\\DefaultIcon\\Default", icon_str); + settings.setValue("Magnet\\shell\\Default", "open"); + settings.setValue("Magnet\\shell\\open\\command\\Default", command_str); } #endif