[Slim-Checkins] r11827 - /branches/6.5/platforms/win32/SlimTray.pl

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Apr 25 15:21:56 2007
New Revision: 11827

URL: http://svn.slimdevices.com?rev=11827&view=rev
Log:
Bug: N/A
Description: fallback to attempting to kill process if stopping
service failed (matches change to startup in r11798)

Modified:
    branches/6.5/platforms/win32/SlimTray.pl

Modified: branches/6.5/platforms/win32/SlimTray.pl
URL: http://svn.slimdevices.com/branches/6.5/platforms/win32/SlimTray.pl?rev=11827&r1=11826&r2=11827&view=diff
==============================================================================
--- branches/6.5/platforms/win32/SlimTray.pl (original)
+++ branches/6.5/platforms/win32/SlimTray.pl Wed Apr 25 15:21:56 2007
@@ -349,16 +349,11 @@
 
 sub stopSlimServer {
 
-	if (startupTypeIsService()) {
-
-		if (!Win32::Service::StopService('', $serviceName)) {
-
-			showErrorMessage("Stopping $errString");
-
-			return;
-		}
-
-	} else {
+	if (startupTypeIsService() && Win32::Service::StopService('', $serviceName)) {
+
+		# service stopped
+
+	}  else {
 
 		my $pid = processID();