diff options
author | Robert Loehning <robert.loehning@nokia.com> | 2010-01-14 13:07:05 +0100 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2010-01-14 15:14:33 +0100 |
commit | 20e767ca1dca408aaf378fa8adb83d25d6824367 (patch) | |
tree | 717ae9a0afbdac7ca3b4d0a7318b6752fb2b1f7e | |
parent | 46dd1d0cb2c879056eb1e9590a569b21d3bc9b2f (diff) | |
download | qt-creator-20e767ca1dca408aaf378fa8adb83d25d6824367.tar.gz |
qtcdebugger: Overwriting other versions when registering.
Reviewed-by: Friedemann Kleint
(cherry picked from commit 466571919497ad8f4b86097bd7fa270d3106730c)
-rw-r--r-- | src/tools/qtcdebugger/main.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp index 8be595a0ce..2d50f5fc28 100644 --- a/src/tools/qtcdebugger/main.cpp +++ b/src/tools/qtcdebugger/main.cpp @@ -456,11 +456,12 @@ static bool registerDebuggerKey(const WCHAR *key, // Save old key, which might be missing QString oldDebugger; registryReadStringKey(handle, debuggerRegistryValueNameC, &oldDebugger, errorMessage); - if (oldDebugger.contains(QLatin1String(applicationFileC), Qt::CaseInsensitive)) { + if (!oldDebugger.compare(call, Qt::CaseInsensitive)) { *errorMessage = QLatin1String("The program is already registered as post mortem debugger."); break; } - if (!registryWriteStringKey(handle, debuggerRegistryDefaultValueNameC, oldDebugger, errorMessage)) + if (!(oldDebugger.contains(QLatin1String(applicationFileC), Qt::CaseInsensitive) + || registryWriteStringKey(handle, debuggerRegistryDefaultValueNameC, oldDebugger, errorMessage))) break; if (debug) qDebug() << "registering self as " << call; @@ -485,7 +486,9 @@ bool install(QString *errorMessage) } // Unregister helper: Restore the original debugger key -static bool unregisterDebuggerKey(const WCHAR *key, QString *errorMessage) +static bool unregisterDebuggerKey(const WCHAR *key, + const QString &call, + QString *errorMessage) { HKEY handle = 0; bool success = false; @@ -494,8 +497,7 @@ static bool unregisterDebuggerKey(const WCHAR *key, QString *errorMessage) break; QString debugger; registryReadStringKey(handle, debuggerRegistryValueNameC, &debugger, errorMessage); - if (!(debugger.isEmpty() - || debugger.contains(QLatin1String(applicationFileC), Qt::CaseInsensitive))) { + if (!debugger.isEmpty() && debugger.compare(call, Qt::CaseInsensitive)) { *errorMessage = QLatin1String("The program is not registered as post mortem debugger."); break; } @@ -522,10 +524,10 @@ static bool unregisterDebuggerKey(const WCHAR *key, QString *errorMessage) bool uninstall(QString *errorMessage) { - if (!unregisterDebuggerKey(debuggerRegistryKeyC, errorMessage)) + if (!unregisterDebuggerKey(debuggerRegistryKeyC, debuggerCall(), errorMessage)) return false; #ifdef Q_OS_WIN64 - if (!unregisterDebuggerKey(debuggerWow32RegistryKeyC, errorMessage)) + if (!unregisterDebuggerKey(debuggerWow32RegistryKeyC, debuggerCall(QLatin1String("-wow")), errorMessage)) return false; #endif return true; |