Fixed incorrect Macro processing, stripping spaces around origin, bit stablized crashmail parser

This commit is contained in:
Alexander S. Aganichev
2000-12-10 08:29:00 +00:00
parent 6bf3719817
commit d95538c3e5
3 changed files with 10 additions and 6 deletions

View File

@@ -258,7 +258,7 @@ int IsMacro(gkey key, int type) {
vector<Macro>::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<Macro>::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;
}

View File

@@ -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<lines; n++)