From f376e1ab01ab5e571681a46227620e033c9cd219 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Mon, 9 May 2016 22:56:05 +0100
Subject: [PATCH] Fix #606

---
 Wox/App.xaml.cs                | 3 +--
 Wox/MainWindow.xaml.cs         | 1 +
 Wox/ViewModel/MainViewModel.cs | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
index 2021227c8a..4609198f7f 100644
--- a/Wox/App.xaml.cs
+++ b/Wox/App.xaml.cs
@@ -85,8 +85,7 @@ namespace Wox
             // but if sessionending is not called, exit won't be called when log off / shutdown
             if (!_disposed)
             {
-                var vm = (MainViewModel)Current.MainWindow.DataContext;
-                vm.Save();
+                ((MainViewModel)Current.MainWindow?.DataContext)?.Save();
                 _disposed = true;
             }
         }
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index 95b185d856..8e52f586d4 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -53,6 +53,7 @@ namespace Wox
         {
             InitProgressbarAnimation();
             WindowIntelopHelper.DisableControlBox(this);
+            ThemeManager.Instance.ChangeTheme(_settings.Theme);
 
             var vm = (MainViewModel)DataContext;
             vm.TextBoxSelected += (o, e) => QueryTextBox.SelectAll();
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index 1f90bd8a3b..3f26abbb21 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -69,7 +69,6 @@ namespace Wox.ViewModel
             InternationalizationManager.Instance.Settings = _settings;
             InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
             ThemeManager.Instance.Settings = _settings;
-            ThemeManager.Instance.ChangeTheme(_settings.Theme);
 
             _queryHistoryStorage = new JsonStrorage<QueryHistory>();
             _userSelectedRecordStorage = new JsonStrorage<UserSelectedRecord>();