fixed manual mount VFS exceptions catch

feo-cz · Aug 7, 2015 · a11e6f8 · a11e6f8
1 parent 9d7d6e1
commit a11e6f8
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/Sshfs/Sshfs/MainForm.cs b/Sshfs/Sshfs/MainForm.cs
@@ -66,6 +66,29 @@ void proxyType_SelectedIndexChanged(object sender, EventArgs e) {
           }
         }
 
+        private void tryMountVFS()
+        {
+            try
+            {
+                virtualDrive.Mount();
+            }
+            catch (Exception ex)
+            {
+                if (Visible)
+                {
+                    BeginInvoke(
+                        new MethodInvoker(
+                            () =>
+                            MessageBox.Show(this,
+                                            String.Format("{0} could not connect:\n{1}",
+                                                          "Virtual drive", ex.Message), Text)));
+                }
+                else
+                {
+                    ShowBallon(String.Format("{0} : {1}", "Virtual drive", ex.Message), true);
+                }
+            }
+        }
 
         protected override void OnLoad(EventArgs e)
         {
@@ -101,26 +124,7 @@ protected override void OnLoad(EventArgs e)
             virtualDrive.StatusChanged += drive_VFSStatusChanged;
 
             updateVirtualDriveCombo();
-            try
-            {
-                virtualDrive.Mount();
-            }
-            catch (Exception ex)
-            {
-                if (Visible)
-                {
-                    BeginInvoke(
-                        new MethodInvoker(
-                            () =>
-                            MessageBox.Show(this,
-                                            String.Format("{0} could not connect:\n{1}",
-                                                          "Virtual drive", ex.Message), Text)));
-                }
-                else
-                {
-                    ShowBallon(String.Format("{0} : {1}", "Virtual drive", ex.Message), true);
-                }
-            }
+            this.tryMountVFS();
             buttonVFSupdate();
 
 
@@ -770,7 +774,8 @@ private void buttonVFSMount_Click(object sender, EventArgs e)
 
             if (virtualDrive.Status == DriveStatus.Unmounted)
             {
-                virtualDrive.Mount();
+                this.tryMountVFS();
+
             }else if (virtualDrive.Status == DriveStatus.Mounted)
             {
                 virtualDrive.Unmount();