eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fixes

Browse source
This commit is contained in:
Volker Fischer 2011-05-08 11:31:53 +00:00
parent 03e39405de
commit 8e92d26b70
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/llconserverdlg.cpp
View file

@ -43,7 +43,8 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP,
/* /*
QSettings RegSettings ( "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings RegSettings ( "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run",
QSettings::NativeFormat ); QSettings::NativeFormat );
RegSettings.setValue ( "llcon server", QCoreApplication::applicationFilePath() ); RegSettings.setValue ( "llcon server",
QCoreApplication::applicationFilePath().replace ( "/", "\\" ) );
*/ */
#endif #endif

5
windows/installer.nsi
View file

@ -1,14 +1,15 @@
; llcon NSIS installer script ; llcon NSIS installer script
!define APP_NAME "Llcon" !define APP_NAME "Llcon"
!define REG_AUTO_RUN_NAME "llcon server"
!define APP_EXE "llcon.exe" !define APP_EXE "llcon.exe"
!define AUTORUN_NAME "llcon server"
!define UNINSTALL_EXE "Uninstall.exe" !define UNINSTALL_EXE "Uninstall.exe"
!define INSTALLER_NAME "llconinstaller.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:\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_PATH "C:\Programme\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
!define VS_REDIST_EXE "vcredist_x86.exe" !define VS_REDIST_EXE "vcredist_x86.exe"
!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
!define AUTORUN_KEY "Software\Microsoft\Windows\CurrentVersion\Run"
SetCompressor lzma SetCompressor lzma
@ -75,7 +76,7 @@ Section "Uninstall"
DeleteRegKey HKLM "${UNINST_KEY}" DeleteRegKey HKLM "${UNINST_KEY}"
; the software may have written an auto run entry in the registry, remove it ; 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 "$DESKTOP\${APP_NAME}.lnk"
Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk"