mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Delete the dialog manager before the main frame as having modeless dialogs disappear after the main window is ugly

Browse source 
Originally committed to SVN as r6563.
This commit is contained in:
Thomas Goyne 2012-03-11 23:04:49 +00:00
parent 284eac1c93
commit 43f461e846
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aegisub/src/frame_main.cpp
View file

@ -223,8 +223,6 @@ FrameMain::FrameMain (wxArrayString args)
} }
FrameMain::~FrameMain () { FrameMain::~FrameMain () {
delete context->dialog;
// Because the subs grid is the selection controller, it needs to stay // Because the subs grid is the selection controller, it needs to stay
// alive significantly longer than the other child controls // alive significantly longer than the other child controls
SubsGrid->Reparent(0); SubsGrid->Reparent(0);
@ -566,16 +564,18 @@ void FrameMain::OnCloseWindow (wxCloseEvent &event) {
// Ask user if he wants to save first // Ask user if he wants to save first
bool canVeto = event.CanVeto(); bool canVeto = event.CanVeto();
int result = TryToCloseSubs(canVeto); int result = TryToCloseSubs(canVeto);
if (canVeto && result == wxCANCEL) {
event.Veto();
return;
}
delete context->dialog;
context->dialog = 0;
// Store maximization state // Store maximization state
OPT_SET("App/Maximized")->SetBool(IsMaximized()); OPT_SET("App/Maximized")->SetBool(IsMaximized());
// Abort/destroy Destroy();
if (canVeto) {
if (result == wxCANCEL) event.Veto();
else Destroy();
}
else Destroy();
} }
void FrameMain::OnAutoSave(wxTimerEvent &) try { void FrameMain::OnAutoSave(wxTimerEvent &) try {