Mercurial > mplayer.hg

changeset 32821:f78284fea1aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify condition.
author ib
date Wed, 16 Feb 2011 15:43:47 +0000
parents 9894d8dcf4d4
children deebe1cc3729
files gui/skin/font.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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 );