Fixed: custom keywords not immediatly active;

Version bump;
Moved the busy cursor to actual loading of set;

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@364 0fc631ac-6414-0410-93d0-97cfa31319b6

src/gui/set/window.cpp

@@ -404,9 +404,9 @@ void SetWindow::onFileNew(wxCommandEvent&) {
 
 void SetWindow::onFileOpen(wxCommandEvent&) {
 	if (!askSaveAndContinue()) return;
-	wxBusyCursor busy;
 	wxFileDialog dlg(this, _TITLE_("open set"), _(""), _(""), import_formats(), wxOPEN);
 	if (dlg.ShowModal() == wxID_OK) {
+		wxBusyCursor busy;
 		setSet(import_set(dlg.GetPath()));
 	}
 }
@@ -415,6 +415,7 @@ void SetWindow::onFileSave(wxCommandEvent& ev) {
 	if (set->needSaveAs()) {
 		onFileSaveAs(ev);
 	} else {
+		wxBusyCursor busy;
 		settings.addRecentFile(set->absoluteFilename());
 		set->save();
 		set->actions.setSavePoint();

src/script/functions/basic.cpp

@@ -226,10 +226,10 @@ SCRIPT_RULE_2_N_DEP(expand_keywords, ScriptValueP, _("default expand"), default_
 	SCRIPT_PARAM(Set*, set);
 	KeywordDatabase& db = set->keyword_db;
 	if (db.empty()) {
-		db.add(set->game->keywords);
-		db.add(set->keywords);
 		db.prepare_parameters(set->game->keyword_parameter_types, set->game->keywords);
 		db.prepare_parameters(set->game->keyword_parameter_types, set->keywords);
+		db.add(set->game->keywords);
+		db.add(set->keywords);
 	}
 	SCRIPT_RETURN(db.expand(input, default_expand, combine, ctx));
 }

src/util/version.cpp

@@ -49,7 +49,7 @@ template <> void GetDefaultMember::handle(const Version& v) {
 // ----------------------------------------------------------------------------- : Versions
 
 // NOTE: Don't use leading zeroes, they mean octal
-const Version app_version  = 302; // 0.3.2
+const Version app_version  = 303; // 0.3.3
 #ifdef UNICODE
 const Char* version_suffix = _(" (beta)");
 #else
@@ -64,5 +64,6 @@ const Char* version_suffix = _(" (beta, ascii build)");
  *     0.3.0 : port of code to C++
  *     0.3.1 : new keyword system, some new style options
  *     0.3.2 : package dependencies
+ *     0.3.3 : keyword separator before/after
  */
-const Version file_version = 302; // 0.3.2
+const Version file_version = 303; // 0.3.3