From d860ce528ac5b1f850751e20b8ea0162003d33ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 3 Jun 2024 14:15:45 +0800 Subject: [PATCH] Logo: code clean up --- src/logo/logo.c | 2 +- src/options/logo.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/logo/logo.c b/src/logo/logo.c index 01dfb1de3..4384e1b62 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -429,7 +429,7 @@ static bool logoTryKnownType(void) if(options->type == FF_LOGO_TYPE_NONE) { - logoApplyColors(logoGetBuiltinDetected(FF_LOGO_SIZE_NORMAL), false); + logoPrintNone(); return true; } diff --git a/src/options/logo.c b/src/options/logo.c index bc4e781f7..f1441a2a6 100644 --- a/src/options/logo.c +++ b/src/options/logo.c @@ -43,17 +43,10 @@ logoType: exit(477); } //this is usually wanted when disabling logo - if(strcasecmp(value, "none") == 0) - { - options->paddingTop = 0; - options->paddingRight = 0; - options->paddingLeft = 0; + if(ffStrEqualsIgnCase(value, "none")) options->type = FF_LOGO_TYPE_NONE; - } - else if(strcasecmp(value, "small") == 0) - { + else if(ffStrEqualsIgnCase(value, "small")) options->type = FF_LOGO_TYPE_SMALL; - } else ffOptionParseString(key, value, &options->source); }