# HG changeset patch # User ib # Date 1297871027 0 # Node ID f78284fea1aa6b6433663f4837efe16ca1a8a094 # Parent 9894d8dcf4d42cf82ca3f0da4e4af5fb1a5a8bf0 Simplify condition. diff -r 9894d8dcf4d4 -r f78284fea1aa gui/skin/font.c --- a/gui/skin/font.c Wed Feb 16 15:24:08 2011 +0000 +++ b/gui/skin/font.c Wed Feb 16 15:43:47 2011 +0000 @@ -87,10 +87,7 @@ tmp[strcspn(tmp, "\n\r")] = 0; strswap( tmp,'\t',' ' ); trim( tmp ); - if ((ptmp = strchr(tmp, ';'))) - { - if (ptmp != tmp + 1 || tmp[0] != '"' || tmp[2] != '"') *ptmp = '\0'; - } + if ((ptmp = strchr(tmp, ';')) && !(ptmp == tmp + 1 && tmp[0] == '"' && tmp[2] == '"')) *ptmp = '\0'; if (!*tmp) continue; n = (strncmp(tmp, "\"=", 2) == 0 ? 1 : 0); cutItem( tmp,command,'=',n ); cutItem( tmp,param,'=',n+1 );