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
This commit is contained in:
twanvl
2007-05-13 23:55:37 +00:00
parent 41989c0755
commit 04366b3505
3 changed files with 7 additions and 5 deletions
+2 -2
View File
@@ -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));
}