diff --git a/golded3/geglob.cpp b/golded3/geglob.cpp index 876a5c2..ad88703 100644 --- a/golded3/geglob.cpp +++ b/golded3/geglob.cpp @@ -258,7 +258,7 @@ int IsMacro(gkey key, int type) { vector::iterator m = CFG->macro.begin(); while(m != CFG->macro.end()) { - if((key == m->key) and (type == m->type)) + if(((key == m->key) or (tolower(key) == m->key) or (toupper(key) == m->key)) and (type == m->type)) return true; m++; } @@ -273,7 +273,7 @@ int PlayMacro(gkey key, int type) { vector::iterator m = CFG->macro.begin(); while(m != CFG->macro.end()) { - if((key == m->key) and (type == m->type)) { + if(((key == m->key) or (tolower(key) == m->key) or (toupper(key) == m->key)) and (type == m->type)) { RunMacro(m); return true; } diff --git a/golded3/gemenu.cpp b/golded3/gemenu.cpp index c8775fc..8c487c3 100644 --- a/golded3/gemenu.cpp +++ b/golded3/gemenu.cpp @@ -530,6 +530,7 @@ int SelectFromFile(const char* file, char* selection, const char* title, const c if(n != -1) { strcpy(selection, Listi[n]); strtrim(selection); + strltrim(selection); retval = true; } for(n=0; n