diff options
| author | cmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-12-02 20:05:19 +0000 |
|---|---|---|
| committer | cmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-12-02 20:05:19 +0000 |
| commit | 300063ab8412d8609807e502982429ccaed19fd9 (patch) | |
| tree | f7bc49702ab889f748af64eba79b6c6674313335 /packaging | |
| parent | 6f5e6f54bfd5d2fb98578cea1ff13619ca5186c3 (diff) | |
Allow more than one instance of Wireshark to be started. For now, the stuff
that disallowed it is just commented out. Later, we might choose to make use
of AllowMultipleInstances like other portableapps do, such as Firefox, et al.
This change was made as a result of the following query on the -users list:
http://www.wireshark.org/lists/wireshark-users/201012/msg00008.html
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35104 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index 1e5402cea3..ac0c5c45fb 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -66,6 +66,7 @@ XPStyle on ;=== Program Icon Icon "Files\App\AppInfo\appicon.ico" +;=== Variables Var PROGRAMDIRECTORY Var ADDITIONALPARAMETERS Var EXECSTRING @@ -80,10 +81,10 @@ Var PDRIVE Section "Main" ;=== Check if another WiresharkPortable already running - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${NAME}") i .r1 ?e' - Pop $0 - StrCmp $0 0 CheckINI - Goto WarnAnotherInstance + ;System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${NAME}") i .r1 ?e' + ;Pop $0 + ;StrCmp $0 0 CheckINI + ; Goto WarnAnotherInstance CheckINI: ;=== Find the INI file, if there is one @@ -153,12 +154,12 @@ Section "Main" ;=== Check if Wireshark running from somwehere else (e.g. U3 device) ; if the following step fails, you'll need the FindProcDLL plug-in from: ; http://nsis.sourceforge.net/Find_Process_By_Name - FindProcDLL::FindProc "${PROGRAMEXECUTABLE}" - StrCmp $R0 "1" WarnAnotherInstance GetPassedParameters + ;FindProcDLL::FindProc "${PROGRAMEXECUTABLE}" + ;StrCmp $R0 "1" WarnAnotherInstance GetPassedParameters - WarnAnotherInstance: - MessageBox MB_OK|MB_ICONINFORMATION `Another instance of ${APP} is already running. Please close other instances of ${APP} before launching ${FULLNAME}.` - Abort + ;WarnAnotherInstance: + ; MessageBox MB_OK|MB_ICONINFORMATION `Another instance of ${APP} is already running. Please close other instances of ${APP} before launching ${FULLNAME}.` + ; Abort GetPassedParameters: ;=== Get any passed parameters |