[Slim-Checkins] r10796 - in /branches/6.5: platforms/win32/installer/SlimServer.iss server/Slim/Utils/MySQLHelper.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Nov 29 13:30:28 2006
New Revision: 10796

URL: http://svn.slimdevices.com?rev=10796&view=rev
Log:
Bug: 4506
Description: Merge from trunk -r 10794:10795

Modified:
    branches/6.5/platforms/win32/installer/SlimServer.iss
    branches/6.5/server/Slim/Utils/MySQLHelper.pm

Modified: branches/6.5/platforms/win32/installer/SlimServer.iss
URL: http://svn.slimdevices.com/branches/6.5/platforms/win32/installer/SlimServer.iss?rev=10796&r1=10795&r2=10796&view=diff
==============================================================================
--- branches/6.5/platforms/win32/installer/SlimServer.iss (original)
+++ branches/6.5/platforms/win32/installer/SlimServer.iss Wed Nov 29 13:30:28 2006
@@ -77,9 +77,6 @@
 Filename: {app}\SlimTray.exe; Description: Launch SlimServer application; WorkingDir: "{app}"; Flags: nowait skipifsilent runmaximized
 Filename: {app}\Getting Started.html; Description: Read Getting Started document; Flags: shellexec skipifsilent postinstall
 
-[UninstallRun]
-Filename: {app}\SlimTray.exe; WorkingDir: "{app}"; Parameters: "--exit"; Flags: runmaximized
-
 [UninstallDelete]
 Type: dirifempty; Name: {app}
 Type: dirifempty; Name: {app}\server
@@ -99,6 +96,8 @@
 [UninstallRun]
 Filename: {app}\SlimTray.exe; Parameters: -exit; WorkingDir: {app}; Flags: skipifdoesntexist runminimized; MinVersion: 0,4.00.1381
 Filename: net; Parameters: stop slimsvc; Flags: runminimized; MinVersion: 0,4.00.1381
+Filename: sc; Parameters: stop SlimServerMySQL; Flags: runminimized; MinVersion: 0,4.00.1381
+Filename: sc; Parameters: delete SlimServerMySQL; Flags: runminimized; MinVersion: 0,4.00.1381
 Filename: {app}\server\slim.exe; Parameters: -remove; WorkingDir: {app}\server; Flags: skipifdoesntexist runminimized; MinVersion: 0,4.00.1381
 
 [Code]

Modified: branches/6.5/server/Slim/Utils/MySQLHelper.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Utils/MySQLHelper.pm?rev=10796&r1=10795&r2=10796&view=diff
==============================================================================
--- branches/6.5/server/Slim/Utils/MySQLHelper.pm (original)
+++ branches/6.5/server/Slim/Utils/MySQLHelper.pm Wed Nov 29 13:30:28 2006
@@ -320,9 +320,14 @@
 
        		if (scalar keys %status != 0) {
 
-			$::d_mysql && msg("Running as Windows service, skipping shutdown.\n");
-
-			return;
+			$::d_mysql && msg("Running service shutdown.\n");
+
+			if (Win32::Service::StopService('', $serviceName)) {
+
+				return;
+			}
+
+			errorMsg("Running service shutdown failed!\n");
 		}
 	}