From 6ccaf3f106ac6da835b216bb90596a1ebb621be2 Mon Sep 17 00:00:00 2001
From: Alexey Golub <Tyrrrrrr@gmail.com>
Date: Mon, 2 Oct 2017 19:09:35 +0300
Subject: [PATCH] Fix settings not loading early enough

---
 DiscordChatExporter/Container.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/DiscordChatExporter/Container.cs b/DiscordChatExporter/Container.cs
index 459f6ec..8d7a9e4 100644
--- a/DiscordChatExporter/Container.cs
+++ b/DiscordChatExporter/Container.cs
@@ -11,11 +11,14 @@ namespace DiscordChatExporter
         {
             ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
 
+            // Settings
+            SimpleIoc.Default.Register<ISettingsService, SettingsService>();
+            ServiceLocator.Current.GetInstance<ISettingsService>().Load();
+
             // Services
             SimpleIoc.Default.Register<IDataService, DataService>();
             SimpleIoc.Default.Register<IExportService, ExportService>();
             SimpleIoc.Default.Register<IMessageGroupService, MessageGroupService>();
-            SimpleIoc.Default.Register<ISettingsService, SettingsService>();
 
             // View models
             SimpleIoc.Default.Register<IErrorViewModel, ErrorViewModel>(true);
@@ -23,14 +26,11 @@ namespace DiscordChatExporter
             SimpleIoc.Default.Register<IExportSetupViewModel, ExportSetupViewModel>(true);
             SimpleIoc.Default.Register<IMainViewModel, MainViewModel>(true);
             SimpleIoc.Default.Register<ISettingsViewModel, SettingsViewModel>(true);
-
-            // Load settings
-            ServiceLocator.Current.GetInstance<ISettingsService>().Load();
         }
 
         public static void Cleanup()
         {
-            // Save settings
+            // Settings
             ServiceLocator.Current.GetInstance<ISettingsService>().Save();
         }