Call CallOnUnloaded on ShutdownStarted

RicoSuter · Feb 14, 2018 · 3959db1 · 3959db1
1 parent 604c36c
commit 3959db1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@
 /src/MyToolkit.Tests.WinRT/AppPackages
 /src/SampleUniversalPhoneApp/AppPackages
 /src/SampleWindowsStoreApp/AppPackages
-/src/SampleWindowsStoreApp/BundleArtifacts
+/src/SampleWindowsStoreApp/BundleArtifacts
+/src/.vs/MyToolkit.VS2015/v15/Server/sqlite3
diff --git a/src/MyToolkit.Extended/Mvvm/ViewModelHelper.cs b/src/MyToolkit.Extended/Mvvm/ViewModelHelper.cs
@@ -91,6 +91,8 @@ public static void RegisterViewModel(ViewModelBase viewModel, FrameworkElement v
 
             view.Loaded += (sender, args) => viewModel.CallOnLoaded();
             view.Unloaded += (sender, args) => viewModel.CallOnUnloaded();
+
+            view.Dispatcher.ShutdownStarted += delegate { viewModel.CallOnUnloaded(); };
         }
 
         #endif