Merge branch 'release-v2.3.2'

HISTORY.md

@@ -1,3 +1,11 @@
+Version 2.3.2 (2017-03-06)
+------------------------------------------------------------------------
+
+- Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.3.1 (2017-03-03)
 ------------------------------------------------------------------------
 

Tests/Controller/SettingsRepositoryTest.cs

@@ -27,18 +27,18 @@ namespace Tests.Controller
     [TestFixture]
     class SettingsRepositoryTest
     {
-        string _savedSettings;
+        SettingsRepository _savedRepository;
 
         [SetUp]
         public void SetUp()
         {
-            _savedSettings = zaaReloaded2.UserSettings.Default.SettingsRepository;
+            _savedRepository = zaaReloaded2.UserSettings.Default.SettingsRepository;
         }
 
         [TearDown]
         public void TearDown()
         {
-            zaaReloaded2.UserSettings.Default.SettingsRepository = _savedSettings;
+            zaaReloaded2.UserSettings.Default.SettingsRepository = _savedRepository;
             zaaReloaded2.UserSettings.Default.Save();
         }
 

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.3.1
+2.3.2
 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
-21c3a526191ec71fe8681a447b54d2447de4e69c54e44d1ab27d6fbf2a05f7c3  deploy/releases/zaaReloaded-2.3.1.exe
+49d8383326222a88ce447a7c97eba596ffd5782f307f8730ffac83743821949f  deploy/releases/zaaReloaded-2.3.2.exe
 

zaaReloaded2/ThisAddIn.cs

@@ -26,6 +26,7 @@ using System.Windows.Input;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Configuration;
+using System.Windows.Threading;
 
 namespace zaaReloaded2
 {
@@ -89,7 +90,12 @@ namespace zaaReloaded2
                     Updater.Version.Current.ToString()
                 );
 
-            ViewModels.FirstRunViewModel.InjectIntoIfNeeded<Views.FirstRunView>();
+            _dispatcher = Dispatcher.CurrentDispatcher;
+            System.Threading.Timer timer = new System.Threading.Timer((obj) =>
+            {
+                _dispatcher.Invoke((Action)(() => ViewModels.FirstRunViewModel.InjectIntoIfNeeded<Views.FirstRunView>()), null);
+
+            }, null, 500, System.Threading.Timeout.Infinite);
             Logger.Info("ThisAddIn_Startup: Finished startup");
         }
 
@@ -184,6 +190,7 @@ namespace zaaReloaded2
         Ribbon _ribbon;
         string _oldCaption;
         UpdaterViewModel _updaterVM;
+        Dispatcher _dispatcher;
 
         #endregion
 

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.3.1
+2.3.2
-2.3.1.0
+2.3.2.0