amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 14:07:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made spec_sort specifications featuring more than one '()' not hang.

Browse Source 
Added error window if a script error occurs while loading a set.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@412 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-05-23 00:47:18 +00:00
parent 9762524025
commit 06138ee325
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/new_window.cpp
+5
View File
@@ -91,10 +91,15 @@ void NewSetWindow::OnOK(wxCommandEvent&) {
} }
void NewSetWindow::done() { void NewSetWindow::done() {
try {
StyleSheetP stylesheet = stylesheet_list->getSelection<StyleSheet>(); StyleSheetP stylesheet = stylesheet_list->getSelection<StyleSheet>();
set = new_intrusive1<Set>(stylesheet); set = new_intrusive1<Set>(stylesheet);
set->validate(); set->validate();
EndModal(wxID_OK); EndModal(wxID_OK);
} catch (Error& e) {
handle_error(e);
throw; // We want to crash.
}
} }
void NewSetWindow::onUpdateUI(wxUpdateUIEvent& ev) { void NewSetWindow::onUpdateUI(wxUpdateUIEvent& ev) {
src/script/functions/basic.cpp
+1 -1
View File
@@ -510,7 +510,7 @@ String spec_sort(const String& spec, const String& input) {
pos = end; pos = end;
} else if (c == _('(')) { // in a cycle } else if (c == _('(')) { // in a cycle
size_t end = spec.find_first_of(_(')')); size_t end = spec.find_first_of(_(')'), pos);
if (end == String::npos) throw ParseError(_("Expected ')' in sort_rule specification")); if (end == String::npos) throw ParseError(_("Expected ')' in sort_rule specification"));
ret += cycle_sort(spec.substr(pos + 1, end - pos - 1), input); ret += cycle_sort(spec.substr(pos + 1, end - pos - 1), input);
pos = end; pos = end;