universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed window closing code (hopefully once and for all)

Browse Source
This commit is contained in:
Michael Becker 2015-04-24 12:21:28 -04:00
parent 3db2e75140
commit 5062605962
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs
View File

@ -1570,11 +1570,15 @@ namespace UniversalEditor.UserInterface.WindowsForms
{
base.OnClosing(e);
if (!WindowsFormsEngine.SessionLoading && Engine.CurrentEngine.Windows.Count == 0)
if (!WindowsFormsEngine.SessionLoading && Engine.CurrentEngine.Windows.Count == 1)
{
if (Engine.CurrentEngine.ConfigurationManager.GetValue<bool>(new string[] { "Application", "ConfirmExit" }, false))
{
if (MessageBox.Show("Are you sure you wish to quit " + Engine.CurrentEngine.DefaultLanguage.GetStringTableEntry("ApplicationTitle") + "?", "Quit Application", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.No) return;
if (MessageBox.Show("Are you sure you wish to quit " + Engine.CurrentEngine.DefaultLanguage.GetStringTableEntry("ApplicationTitle") + "?", "Quit Application", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.No)
{
e.Cancel = true;
return;
}
}
}
@ -1650,6 +1654,12 @@ namespace UniversalEditor.UserInterface.WindowsForms
{
base.OnClosed(e);
if (WindowClosed != null) WindowClosed(this, e);
if (Engine.CurrentEngine.Windows.Count == 0)
{
// there are no more windows, so exit the application
Application.Exit();
}
}
#endregion
#region Menu Bar