Add command line to stop TVService from setuptv.

MediaPortal · Dec 24, 2012 · 39814f7 · 39814f7
1 parent bf8ced0
commit 39814f7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -360,8 +360,11 @@ ${MementoSection} "MediaPortal TV Server" SecServer
 
   ; Kill running Programs
   ${LOG_TEXT} "INFO" "Terminating processes ..."
-  ${StopService} "TVservice"
   ${KillProcess} "SetupTv.exe"
+  ${LOG_TEXT} "INFO" "Stop TVService from setuptv ..."
+  ExecWait '"$INSTDIR\SetupTv.exe" /tvservicestop'
+  ${KillProcess} "SetupTv.exe"
+  ${StopService} "TVservice"
 
   SetOverwrite on
 
@@ -492,8 +495,11 @@ ${MementoSectionEnd}
 
   ; Kill running Programs
   ${LOG_TEXT} "INFO" "Terminating processes ..."
-  ${StopService} "TVservice"
   ${KillProcess} "SetupTv.exe"
+  ${LOG_TEXT} "INFO" "Stop TVService from setuptv ..."
+  ExecWait '"$INSTDIR\SetupTv.exe" /tvservicestop'
+  ${KillProcess} "SetupTv.exe"
+  ${StopService} "TVservice"
 
   #---------------------------------------------------------------------------
   # CLEARING DATABASE if RemoveAll was selected

diff --git a/TvEngine3/TVLibrary/SetupTv/Startup.cs b/TvEngine3/TVLibrary/SetupTv/Startup.cs
@@ -41,7 +41,8 @@ public enum StartupMode
     Wizard,
     DbCleanup,
     DbConfig,
-    DeployMode
+    DeployMode,
+    TvserviceStop
   }
 
   /// <summary>
@@ -126,6 +127,11 @@ public static void Main(string[] arguments)
           case "/debugoptions":
             debugOptions = true;
             break;
+
+          case "/tvservicestop":
+            ServiceHelper.Stop();
+            startupMode = StartupMode.TvserviceStop;
+            break;
         }
 
         if (param.StartsWith("--Deploy"))
@@ -148,6 +154,12 @@ public static void Main(string[] arguments)
         }
       }
 
+      // Avoid the visual and close part of SetupTv on Tvservice stop
+      if (startupMode == StartupMode.TvserviceStop)
+      {
+        return;
+      }
+
       Application.SetCompatibleTextRenderingDefault(false);
 
       // set working dir from application.exe