Fixed issue #36

A proper error is now displayed when a non-existent VM is started via a shortcut. Also changed the "VM already running" messagebox to information.
86Box · Dec 31, 2018 · ff566ea · ff566ea
1 parent 4023ffb
commit ff566ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/86BoxManager/Properties/AssemblyInfo.cs b/86BoxManager/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.2.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]
diff --git a/86BoxManager/frmMain.cs b/86BoxManager/frmMain.cs
@@ -983,18 +983,27 @@ protected override void WndProc(ref Message m)
                 //Get the VM name and find the associated LVI and VM object
                 CopyDataStruct ds = (CopyDataStruct)m.GetLParam(typeof(CopyDataStruct));
                 ListViewItem lvi = lstVMs.FindItemWithText(ds.Data);
-                VM vm = (VM)lvi.Tag;
 
-                //If the VM is already running, display an error, otherwise, start it
-                if (vm.Status != VM.STATUS_STOPPED)
+                //This check is necessary in case the specified VM was already removed but the shortcut remains
+                if(lvi != null)
                 {
-                    MessageBox.Show("This virtual machine is already running.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    VM vm = (VM)lvi.Tag;
+
+                    //If the VM is already running, display an error, otherwise, start it
+                    if (vm.Status != VM.STATUS_STOPPED)
+                    {
+                        MessageBox.Show("The virtual machine \"" + ds.Data + "\" is already running.", "Virtual machine already running", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    else
+                    {
+                        lvi.Focused = true;
+                        lvi.Selected = true;
+                        VMStart();
+                    }
                 }
                 else
                 {
-                    lvi.Focused = true;
-                    lvi.Selected = true;
-                    VMStart();
+                    MessageBox.Show("The virtual machine \"" + ds.Data + "\" could not be found. It may have been removed or the specified name is invalid.", "Virtual machine not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
             base.WndProc(ref m);