build 20171107

bug fix fix the bug when importing from vm-settings and select a VM that is locked, VMGuide replyed "VM is locked" followed by "Settings imported successfully".
driver1998 · Nov 6, 2017 · ffe264c · ffe264c
1 parent c779ed9
commit ffe264c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/VMGuide.GUI/HomePage.xaml.cs b/VMGuide.GUI/HomePage.xaml.cs
@@ -160,6 +160,7 @@ private void OpenVM(VirtualMachine VM)
                 catch (UnauthorizedAccessException e)
                 {
                     MessageBox.Show(e.Message, "VMGuide", MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
                 }
             }
 

diff --git a/VMGuide.GUI/Properties/AssemblyInfo.cs b/VMGuide.GUI/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("VMGuide")]
-[assembly: AssemblyDescription("Build 20171014")]
+[assembly: AssemblyDescription("Build 20171107")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("VMGuide")]
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.1.0")]
+[assembly: AssemblyFileVersion("3.1.1.0")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,6 +160,7 @@ private void OpenVM(VirtualMachine VM) @@
                     catch (UnauthorizedAccessException e)
                     {
                         MessageBox.Show(e.Message, "VMGuide", MessageBoxButton.OK, MessageBoxImage.Information);
+                        return;
                     }
                 }
@@ Expand Down @@