Change auto-start and auto-shutdown behavior

dsdude123 · Feb 15, 2021 · ad0408e · ad0408e
1 parent f856f1d
commit ad0408e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 29 deletions.
diff --git a/GroovyRPCore/Program.cs b/GroovyRPCore/Program.cs
@@ -26,18 +26,9 @@ private static void Main()
             TrackInfo oldTrack = new TrackInfo();
 
             bool isPresenceActive = false;
-            bool hasGrooveMusicStartedOnce = false;
 
             while (_client.IsInitialized)
             {
-                Process[] grooveMusics = Process.GetProcessesByName("Music.UI");
-                if (hasGrooveMusicStartedOnce && grooveMusics.Length < 1)
-                {
-                    Environment.Exit(0);
-                } else if (grooveMusics.Length > 0)
-                {
-                    hasGrooveMusicStartedOnce = true;
-                }
                 if (_grooveInfoFetcher.IsUsingAudio())
                 {
                     try

diff --git a/GroovyRPHelper/Program.cs b/GroovyRPHelper/Program.cs
@@ -35,20 +35,6 @@ static void Main()
             }
 
             Config myConfig = LoadConfiguration();
-            if(myConfig.RunWhenGrooveMusicOpens)
-            {
-                Process[] grooveMusicInstances = Process.GetProcessesByName("Music.UI");
-                if (grooveMusicInstances.Length > 0)
-                {
-                    Process grooveMusic = grooveMusicInstances[0];
-                    if ((grooveMusic.Threads[0].ThreadState == ThreadState.Wait) && grooveMusic.Threads[0].WaitReason == ThreadWaitReason.Suspended)
-                    {
-                        // Some times Groove Music will start up suspended in the background with Suspended state and generate an event. 
-                        // Ok to close GroovyRP since user did not open Groove Music.
-                        Environment.Exit(0);
-                    }
-                }
-            }
 
             string corePath = Path.GetDirectoryName(Application.ExecutablePath) + @"\GroovyRPCore.exe";
             if (myConfig.HideInSystemTray)
@@ -88,10 +74,11 @@ static void Main()
             systemTray.ContextMenu = contextMenu;
             systemTray.Visible = true;
 
-            if(myConfig.AutoCheckForUpdates) UpdateCheck();
+            if(myConfig.AutoCheckForUpdates) UpdateCheck(null, null);
 
             while (!coreProcess.HasExited)
             {
+                checkGrooveMusicStatus(); // Don't allow program to keep running if Groove Music isn't running
                 Application.DoEvents();
             }
             Environment.Exit(0);
@@ -223,11 +210,6 @@ private static void Reconfigure(object Sender, EventArgs e)
         }
 
         private static void UpdateCheck(object Sender, EventArgs e)
-        {
-            UpdateCheck();
-        }
-
-        private static void UpdateCheck()
         {
             try
             {
@@ -251,6 +233,40 @@ private static void UpdateCheck()
             catch { }
         }
 
+        public static void checkGrooveMusicStatus()
+        {
+            Process[] grooveMusics = Process.GetProcessesByName("Music.UI");
+            if (grooveMusics.Length < 1)
+            {
+                Environment.Exit(0);
+            }
+            else if (grooveMusics.Length > 0)
+            {
+                try
+                {
+                    Process grooveMusic = grooveMusics[0];
+                    ProcessThread grooveMusicMainThread = null;
+
+                    for (int i = 0; i < grooveMusic.Threads.Count; i++)
+                    {
+                        if (grooveMusicMainThread == null || grooveMusic.Threads[i].StartTime < grooveMusicMainThread.StartTime)
+                        {
+                            grooveMusicMainThread = grooveMusic.Threads[i];
+                        }
+                    }
+
+                    if (grooveMusicMainThread.ThreadState.Equals(ThreadState.Terminated) ||
+                        (grooveMusicMainThread.ThreadState.Equals(ThreadState.Wait) && grooveMusicMainThread.WaitReason.Equals(ThreadWaitReason.Suspended)))
+                    {
+                        ExitProgram(null, null);
+                    }
+                } catch (InvalidOperationException)
+                {
+
+                }
+            }
+        }
+
         private static void UpdateNotificationClicked(object Sender, EventArgs e)
         {
             Process.Start(@"https://github.com/dsdude123/GroovyRP/releases/latest");