diff --git a/BackupEssentials/App.xaml.cs b/BackupEssentials/App.xaml.cs index e493616..3b6c9a9 100644 --- a/BackupEssentials/App.xaml.cs +++ b/BackupEssentials/App.xaml.cs @@ -14,6 +14,8 @@ namespace BackupEssentials{ [DllImport("USER32.DLL")] public static extern bool SetForegroundWindow(IntPtr hwnd); + public static Window Window { get { return Application.Current.MainWindow; } } + /// <summary> /// List of arguments /// ================= @@ -63,11 +65,11 @@ namespace BackupEssentials{ return; } else{ - if (MessageBox.Show("The application is already running, but is not responding. Do you want to force close it?","Application is already running",MessageBoxButton.YesNo,MessageBoxImage.Question) == MessageBoxResult.Yes){ + if (MessageBox.Show(MainWindow,"The application is already running, but is not responding. Do you want to force close it?","Application is already running",MessageBoxButton.YesNo,MessageBoxImage.Question) == MessageBoxResult.Yes){ try{ process.Kill(); }catch(Exception e){ - MessageBox.Show("Could not close the application: "+e.Message); + MessageBox.Show(MainWindow,"Could not close the application: "+e.Message); } } } diff --git a/BackupEssentials/Pages/BackupEdit.xaml.cs b/BackupEssentials/Pages/BackupEdit.xaml.cs index 667298f..b384227 100644 --- a/BackupEssentials/Pages/BackupEdit.xaml.cs +++ b/BackupEssentials/Pages/BackupEdit.xaml.cs @@ -40,7 +40,7 @@ namespace BackupEssentials.Pages{ private void ClickSave(object sender, RoutedEventArgs e){ if (EditLocation.Name.Length == 0){ VisualStateManager.GoToState(TextBoxName,"Invalid",true); - System.Windows.MessageBox.Show("Location name cannot be empty.","Caution!",MessageBoxButton.OK,MessageBoxImage.Warning); + System.Windows.MessageBox.Show(App.Window,"Location name cannot be empty.","Caution!",MessageBoxButton.OK,MessageBoxImage.Warning); return; } @@ -56,7 +56,7 @@ namespace BackupEssentials.Pages{ if (warning.Length != 0){ VisualStateManager.GoToState(TextBoxDirectory,"Invalid",true); LastWarningDirectory = EditLocation.Directory; - System.Windows.MessageBox.Show(warning+" Click Save again to confirm.","Caution!",MessageBoxButton.OK,MessageBoxImage.Warning); + System.Windows.MessageBox.Show(App.Window,warning+" Click Save again to confirm.","Caution!",MessageBoxButton.OK,MessageBoxImage.Warning); return; } }