Fix exception when opening options dialog and no open solution

sboulema · Nov 20, 2017 · a9adfe1 · a9adfe1
1 parent ddfdc42
commit a9adfe1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/TSVN/Options/OptionsDialog.Designer.cs b/TSVN/Options/OptionsDialog.Designer.cs
diff --git a/TSVN/Options/OptionsDialog.cs b/TSVN/Options/OptionsDialog.cs
@@ -1,5 +1,6 @@
 using EnvDTE;
 using System;
+using System.IO;
 using System.Windows.Forms;
 
 namespace SamirBoulema.TSVN.Options
@@ -12,8 +13,18 @@ public OptionsDialog(DTE dte)
         {
             InitializeComponent();
             OptionsHelper.Dte = dte;
-            options = OptionsHelper.GetOptions();
-            rootFolderTextBox.Text = options.RootFolder;
+
+            if (File.Exists(dte.Solution.FileName))
+            {
+                options = OptionsHelper.GetOptions();
+                rootFolderTextBox.Text = options.RootFolder;
+            }
+            else
+            {
+                rootFolderTextBox.Enabled = false;
+                okButton.Enabled = false;
+                browseButton.Enabled = false;
+            }
         }
 
         private void cancelButton_Click(object sender, EventArgs e)

diff --git a/TSVN/Options/OptionsHelper.cs b/TSVN/Options/OptionsHelper.cs
@@ -10,7 +10,11 @@ public static class OptionsHelper
 
         public static Options GetOptions()
         {
-            var solutionFolder = Path.GetDirectoryName(Dte.Solution.FileName);
+            var solutionFilePath = Dte.Solution.FileName;
+
+            if (!File.Exists(solutionFilePath)) return new Options();
+
+            var solutionFolder = Path.GetDirectoryName(solutionFilePath);
             var settingFilePath = Path.Combine(solutionFolder, "TSVN.json");
 
             if (File.Exists(settingFilePath))
@@ -26,7 +30,11 @@ public static void SaveOptions(Options options)
         {
             var json = JsonConvert.SerializeObject(options);
 
-            var solutionFolder = Path.GetDirectoryName(Dte.Solution.FileName);
+            var solutionFilePath = Dte.Solution.FileName;
+
+            if (!File.Exists(solutionFilePath)) return;
+
+            var solutionFolder = Path.GetDirectoryName(solutionFilePath);
             File.WriteAllText(Path.Combine(solutionFolder, "TSVN.json"), json);
         }
     }

diff --git a/TSVN/source.extension.vsixmanifest b/TSVN/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="07fd7462-cd4b-433b-9ab5-8ad3ad87bc65" Version="4.1" Language="en-US" Publisher="Samir L. Boulema" />
+        <Identity Id="07fd7462-cd4b-433b-9ab5-8ad3ad87bc65" Version="4.2" Language="en-US" Publisher="Samir L. Boulema" />
         <DisplayName>TSVN</DisplayName>
         <Description>Control TortoiseSVN from within Visual Studio</Description>
         <MoreInfo>https://marketplace.visualstudio.com/items?itemName=SamirBoulema.TSVN</MoreInfo>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.1.{build}
+version: 4.2.{build}
 skip_tags: true
 
 configuration: