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

Handle modeless dialogs which never fully open

Browse source 
Fixes crash when opening the spell checker dialog after no spelling
errors were found previously.

Closes #1491.

Originally committed to SVN as r6824.
This commit is contained in:
Thomas Goyne 2012-05-18 14:01:56 +00:00
parent 904b5aafe4
commit c7fb7eb295
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/dialog_manager.h
View file

@ -69,10 +69,13 @@ public:
it->second->SetFocus();
}
else {
wxDialog *d = new DialogType(c);
created_dialogs[&typeid(DialogType)] = d;
d->Bind(wxEVT_CLOSE_WINDOW, &DialogManager::OnClose, this);
d->Show();
try {
wxDialog *d = new DialogType(c);
created_dialogs[&typeid(DialogType)] = d;
d->Bind(wxEVT_CLOSE_WINDOW, &DialogManager::OnClose, this);
d->Show();
}
catch (agi::UserCancelException const&) { }
}
}

10
aegisub/src/dialog_spellchecker.cpp
View file

@ -48,6 +48,8 @@
#include "subs_edit_ctrl.h"
#include "utils.h"
#include <libaegisub/exception.h>
static void save_skip_comments(wxCommandEvent &evt) {
OPT_SET("Tool/Spell Checker/Skip Comments")->SetBool(!!evt.GetInt());
}
@ -93,15 +95,13 @@ DialogSpellChecker::DialogSpellChecker(agi::Context *context)
{
if (!spellchecker.get()) {
wxMessageBox("No spellchecker available.", "Error", wxOK | wxICON_ERROR | wxCENTER);
Destroy();
return;
throw agi::UserCancelException("No spellchecker available");
}
dictionary_lang_codes = spellchecker->GetLanguageList();
if (dictionary_lang_codes.empty()) {
wxMessageBox("No spellchecker dictionaries available.", "Error", wxOK | wxICON_ERROR | wxCENTER);
Destroy();
return;
throw agi::UserCancelException("No spellchecker dictionaries available");
}
wxArrayString language_names(dictionary_lang_codes);
@ -238,7 +238,7 @@ bool DialogSpellChecker::FindNext() {
}
else {
wxMessageBox(_("Aegisub has found no spelling mistakes in this script."), _("Spell checking complete."));
Destroy();
throw agi::UserCancelException("No spelling mistakes");
}
return false;