From b4058b2ed68e44fd46633d1b81b5d16fea5eea86 Mon Sep 17 00:00:00 2001 From: Tichau Date: Wed, 27 May 2015 11:16:10 +0200 Subject: [PATCH] Cancel auto exit when the user do an action. --- Application/FileConverter/Application.xaml.cs | 11 +++++++++++ Application/FileConverter/Windows/MainWindow.xaml.cs | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index 2e76a35..1e215c5 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -33,6 +33,7 @@ namespace FileConverter private bool debugMode; private bool initialized; + private bool cancelAutoExit; public Application() { @@ -79,6 +80,11 @@ namespace FileConverter set; } + public void CancelAutoExit() + { + this.cancelAutoExit = true; + } + private void Initialize() { // Load settigns. @@ -238,6 +244,11 @@ namespace FileConverter { System.Threading.Thread.Sleep(3000); + if (this.cancelAutoExit) + { + return; + } + Dispatcher.BeginInvoke((Action)(() => Application.Current.Shutdown())); } #endif diff --git a/Application/FileConverter/Windows/MainWindow.xaml.cs b/Application/FileConverter/Windows/MainWindow.xaml.cs index 07aa015..3615955 100644 --- a/Application/FileConverter/Windows/MainWindow.xaml.cs +++ b/Application/FileConverter/Windows/MainWindow.xaml.cs @@ -76,6 +76,8 @@ namespace FileConverter this.diagnosticsWindow = new DiagnosticsWindow(); } + Application application = Application.Current as Application; + application?.CancelAutoExit(); this.diagnosticsWindow.Show(); } @@ -90,6 +92,8 @@ namespace FileConverter this.settingsWindow = new SettingsWindow(); } + Application application = Application.Current as Application; + application?.CancelAutoExit(); this.settingsWindow.Show(); } }