Bump version, fix multi-emulator freaking out on Windowless processes

projectcomet64 · Dec 23, 2020 · 63e9748 · 63e9748
1 parent 6ffd3c6
commit 63e9748
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/M64MM2/MainForm.cs b/M64MM2/MainForm.cs
@@ -9,6 +9,7 @@
 using M64MM.Additions;
 using System.Diagnostics;
 using System.ComponentModel;
+using System.Linq;
 
 namespace M64MM2
 {
@@ -179,8 +180,17 @@ void Update(object sender, EventArgs e)
 
         void MoreThanOneEmu(object sender, Process[] proc)
         {
-            EmuSelectorForm es = new EmuSelectorForm(proc);
-            es.ShowDialog();
+            Process[] n_plist = proc.Where(x => !string.IsNullOrEmpty(x.MainWindowTitle)).ToArray();
+            EmuSelectorForm es = new EmuSelectorForm(n_plist);
+            if (n_plist.Length > 1)
+            {
+                es.ShowDialog();
+            }
+            else
+            {
+                StopProcessSearch = false;
+            }
+
         }
 
         void EmulatorSelected(object sender, EventArgs e)

diff --git a/M64MM2/Properties/Resources.Designer.cs b/M64MM2/Properties/Resources.Designer.cs
diff --git a/M64MM2/Properties/Resources.resx b/M64MM2/Properties/Resources.resx
@@ -179,7 +179,7 @@
     <value>long</value>
   </data>
   <data name="prereleaseString" xml:space="preserve">
-    <value>-alpha2.wgp1</value>
+    <value>-alpha3</value>
   </data>
   <data name="invalidAnimSelected" xml:space="preserve">
     <value>You have entered an invalid animation name into {0}. Please make sure to choose a valid option from the list.</value>