From 8e92d26b70db8bec1fdb83bf227a1a501493a2b0 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 8 May 2011 11:31:53 +0000
Subject: [PATCH] bug fixes

---
 src/llconserverdlg.cpp | 3 ++-
 windows/installer.nsi  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp
index fe7b4cbe..b7a4e449 100755
--- a/src/llconserverdlg.cpp
+++ b/src/llconserverdlg.cpp
@@ -43,7 +43,8 @@ CLlconServerDlg::CLlconServerDlg ( CServer*        pNServP,
 /*
 QSettings RegSettings ( "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run",
                         QSettings::NativeFormat );
-RegSettings.setValue ( "llcon server", QCoreApplication::applicationFilePath() );
+RegSettings.setValue ( "llcon server",
+                       QCoreApplication::applicationFilePath().replace ( "/", "\\" ) );
 */
 #endif
 
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 4064a098..b954b432 100755
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -1,14 +1,15 @@
 ; llcon NSIS installer script
 
 !define APP_NAME          "Llcon"
-!define REG_AUTO_RUN_NAME "llcon server"
 !define APP_EXE			  "llcon.exe"
+!define AUTORUN_NAME      "llcon server"
 !define UNINSTALL_EXE     "Uninstall.exe"
 !define INSTALLER_NAME    "llconinstaller.exe"
 !define VS_REDIST_PATH    "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
 ;!define VS_REDIST_PATH   "C:\Programme\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
 !define VS_REDIST_EXE     "vcredist_x86.exe"
 !define UNINST_KEY        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
+!define AUTORUN_KEY       "Software\Microsoft\Windows\CurrentVersion\Run"
 
 
 SetCompressor lzma
@@ -75,7 +76,7 @@ Section "Uninstall"
 DeleteRegKey HKLM "${UNINST_KEY}"
 
 ; the software may have written an auto run entry in the registry, remove it
-DeleteRegKey HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run\${REG_AUTO_RUN_NAME}"
+DeleteRegValue HKCU "${AUTORUN_KEY}" "${AUTORUN_NAME}"
 
 Delete "$DESKTOP\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk"