Merge pull request #4697 from bclothier/Fix4694

Fixes 4964 (installing with no menu showing)

Author: Vogel612

Rubberduck.Main/Extension.cs

@@ -134,69 +134,71 @@ public void OnDisconnection(ext_DisconnectMode RemoveMode, ref Array custom)
 
         private void InitializeAddIn()
         {
-            if (_isInitialized)
-            {
-                // The add-in is already initialized. See:
-                // The strange case of the add-in initialized twice
-                // http://msmvps.com/blogs/carlosq/archive/2013/02/14/the-strange-case-of-the-add-in-initialized-twice.aspx
-                return;
-            }
-
-            var configLoader = new XmlPersistanceService<GeneralSettings>
-            {
-                FilePath =
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                        "Rubberduck", "rubberduck.config")
-            };
-            var configProvider = new GeneralConfigProvider(configLoader);
-            
-            _initialSettings = configProvider.Create();
-            if (_initialSettings != null)
+            Splash splash = null;
+            try
             {
-                try
+                if (_isInitialized)
                 {
-                    var cultureInfo = CultureInfo.GetCultureInfo(_initialSettings.Language.Code);
-                    Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = cultureInfo;
+                    // The add-in is already initialized. See:
+                    // The strange case of the add-in initialized twice
+                    // http://msmvps.com/blogs/carlosq/archive/2013/02/14/the-strange-case-of-the-add-in-initialized-twice.aspx
+                    return;
                 }
-                catch (CultureNotFoundException)
+
+                var configLoader = new XmlPersistanceService<GeneralSettings>
                 {
-                }
-                try
+                    FilePath =
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                            "Rubberduck", "rubberduck.config")
+                };
+                var configProvider = new GeneralConfigProvider(configLoader);
+
+                _initialSettings = configProvider.Create();
+                if (_initialSettings != null)
                 {
-                    if (_initialSettings.SetDpiUnaware)
+                    try
                     {
-                        SHCore.SetProcessDpiAwareness(PROCESS_DPI_AWARENESS.Process_DPI_Unaware);
+                        var cultureInfo = CultureInfo.GetCultureInfo(_initialSettings.Language.Code);
+                        Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = cultureInfo;
+                    }
+                    catch (CultureNotFoundException)
+                    {
+                    }
+
+                    try
+                    {
+                        if (_initialSettings.SetDpiUnaware)
+                        {
+                            SHCore.SetProcessDpiAwareness(PROCESS_DPI_AWARENESS.Process_DPI_Unaware);
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        Debug.Assert(false, "Could not set DPI awareness.");
                     }
                 }
-                catch (Exception)
+                else
                 {
-                    Debug.Assert(false, "Could not set DPI awareness.");
+                    Debug.Assert(false, "Settings could not be initialized.");
                 }
-            }
-            else
-            {
-                Debug.Assert(false, "Settings could not be initialized.");
-            }
 
-            Splash splash = null;
-            if (_initialSettings.CanShowSplash)
-            {
-                splash = new Splash
+                if (_initialSettings?.CanShowSplash ?? false)
                 {
-                    // note: IVersionCheck.CurrentVersion could return this string.
-                    Version = $"version {Assembly.GetExecutingAssembly().GetName().Version}"
-                };
-                splash.Show();
-                splash.Refresh();
-            }
+                    splash = new Splash
+                    {
+                        // note: IVersionCheck.CurrentVersion could return this string.
+                        Version = $"version {Assembly.GetExecutingAssembly().GetName().Version}"
+                    };
+                    splash.Show();
+                    splash.Refresh();
+                }
 
-            try
-            {
                 Startup();
             }
             catch (Win32Exception)
             {
-                System.Windows.Forms.MessageBox.Show(Resources.RubberduckUI.RubberduckReloadFailure_Message, RubberduckUI.RubberduckReloadFailure_Title,
+                System.Windows.Forms.MessageBox.Show(Resources.RubberduckUI.RubberduckReloadFailure_Message,
+                    RubberduckUI.RubberduckReloadFailure_Title,
                     MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             }
             catch (Exception exception)
@@ -211,8 +213,8 @@ private void InitializeAddIn()
                     RubberduckUI.RubberduckLoadFailure, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
             finally
-            {                
-                splash?.Dispose();                
+            {
+                splash?.Dispose();
             }
         }
 

Rubberduck.SettingsProvider/XmlPersistanceService.cs

@@ -19,6 +19,10 @@ public override T Load(T toDeserialize)
 
             var doc = GetConfigurationDoc(FilePath);
             var node = GetNodeByName(doc, typeof(T).Name);
+            if (node == null)
+            {
+                return FailedLoadReturnValue();
+            }
 
             using (var reader = node.CreateReader())
             {

RubberduckTests/Settings/GeneralSettingsTests.cs

@@ -9,6 +9,7 @@
 using Rubberduck.VBEditor.VbeRuntime.Settings;
 using System;
 using Rubberduck.Interaction;
+using Rubberduck.SettingsProvider;
 
 namespace RubberduckTests.Settings
 {
@@ -154,14 +155,22 @@ public void AutoSavePeriodIsSetInCtor()
             Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);
         }
 
-        //[Category("Settings")]
-        //[Test]
-        //public void DelimiterIsSetInCtor()
-        //{
-        //    var defaultConfig = GetDefaultConfig();
-        //    var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);
-
-        //    Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.Delimiter, (char)viewModel.Delimiter);
-        //}
+        [Category("Settings")]
+        [Test]
+        public void UserSettingsLoadedUsingDefaultWhenMissingFile()
+        {
+            // For this test, we need to use the actual object. Fortunately, the path is virtual, so we
+            // can override that property and force it to use an non-existent path to prove that settings
+            // will be still created using defaults without the file present. 
+            var persisterMock = new Mock<XmlPersistanceService<GeneralSettings>>();
+            persisterMock.Setup(x => x.FilePath).Returns("C:\\some\\non\\existent\\path\\rubberduck");
+            persisterMock.CallBase = true;
+            var configProvider = new GeneralConfigProvider(persisterMock.Object);
+
+            var settings = configProvider.Create();
+            var defaultSettings = configProvider.CreateDefaults();
+
+            Assert.AreEqual(defaultSettings, settings);
+        }
     }
 }