Author: Zero3
Date: 2009-01-23 15:25:00 +0000 (Fri, 23 Jan 2009)
New Revision: 25246
Modified:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
Log:
Various Vista word-wrap fixes and added fix to only try to stop service once
Modified:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
===================================================================
---
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
2009-01-23 15:23:45 UTC (rev 25245)
+++
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
2009-01-23 15:25:00 UTC (rev 25246)
@@ -30,7 +30,7 @@
;
If not (A_IsAdmin)
{
- PopupErrorMessage("The uninstaller requires administrator privileges to
uninstall Freenet.`nPlease make sure that your user account has administrative
access to the system,`nand the uninstaller is executed with access to use these
privileges.")
+ PopupErrorMessage("The uninstaller requires administrator privileges to
uninstall Freenet. Please make sure that your user account has administrative
access to the system, and the uninstaller is executed with access to use these
privileges.")
ExitApp
}
@@ -103,13 +103,15 @@
;
Progress, , Stopping system service...
+_ServiceHasBeenStopped := 0
; Used to make sure that we only stop the service once
(to avoid UAC spam on Vista, among other things)
+
Loop
{
_ServiceState := Service_State("freenet" . _InstallSuffix)
If (A_Index > _ServiceTimeout)
{
- PopupErrorMessage("The uninstaller was unable to control the
Freenet system service as it appears to be stuck.`n`nPlease try again or
reinstall Freenet.`n`nIf the problem keeps occurring, please report this error
message to the developers.")
+ PopupErrorMessage("The uninstaller was unable to control the
Freenet system service as it appears to be stuck.`n`nPlease try again.`n`nIf
the problem keeps occurring, please report this error message to the
developers.")
Exit()
}
Else If (_ServiceState == -1 || _ServiceState == -4)
@@ -122,15 +124,25 @@
Sleep, 1000
Continue
}
+
+
Else If (_ServiceState == 1)
{
Break ; Service is
not running. Continue!
}
Else
{
- Service_Stop("freenet" . _InstallSuffix)
- Sleep, 1000
- Continue
+ If (!_ServiceHasBeenStopped)
+ {
+ _ServiceHasBeenStopped := 1
+ Service_Stop("freenet" . _InstallSuffix)
+ Continue
+ }
+ Else
+ {
+ PopupErrorMessage("The uninstaller was unable to stop
the Freenet system service.`n`nPlease try again.`n`nIf the problem keeps
occurring, please report this error message to the developers.")
+ ExitApp, 1
+ }
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
