From a307977ec116cced88669040f02305e78bf5698f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 3 Jan 2023 15:13:39 +0800 Subject: [PATCH] Image: don't try to read image file with `--logo none` --- CHANGELOG.md | 2 +- src/fastfetch.c | 2 ++ src/fastfetch.h | 1 + src/logo/logo.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9fdb4935..cc1cb0891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -136,7 +136,7 @@ Bugfixes: * Don't segfault in GPU code on Intel Macs (@CarterLi, #236) * Don't use hardcoded size units in presets (@dr460nf1r3, #255) * Don't crash with some format strings (#252) -* --logo-none keeps key color now (#264) +* --logo none keeps key color now (#264) # 1.7.2 diff --git a/src/fastfetch.c b/src/fastfetch.c index 0ac0420f8..af23ab6d4 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -979,6 +979,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con instance->config.logo.paddingTop = 0; instance->config.logo.paddingRight = 0; instance->config.logo.paddingLeft = 0; + instance->config.logo.type = FF_LOGO_TYPE_NONE; } } else if(startsWith(key, "--logo")) @@ -998,6 +999,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con "iterm", FF_LOGO_TYPE_IMAGE_ITERM, "chafa", FF_LOGO_TYPE_IMAGE_CHAFA, "raw", FF_LOGO_TYPE_IMAGE_RAW, + "none", FF_LOGO_TYPE_NONE, NULL ); } diff --git a/src/fastfetch.h b/src/fastfetch.h index 58ca227b0..1f8782a3e 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -38,6 +38,7 @@ typedef enum FFLogoType FF_LOGO_TYPE_IMAGE_ITERM, //image file, printed as iterm graphics protocol FF_LOGO_TYPE_IMAGE_CHAFA, //image file, printed as ascii art using libchafa FF_LOGO_TYPE_IMAGE_RAW, //image file, printed as raw binary string + FF_LOGO_TYPE_NONE, //--logo none } FFLogoType; typedef enum FFBinaryPrefixType diff --git a/src/logo/logo.c b/src/logo/logo.c index 85ed46791..e460ba55e 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -339,6 +339,8 @@ static void logoPrintKnownType(FFinstance* instance) else successfull = logoPrintFileIfExists(instance, false, true); } + else if(instance->config.logo.type == FF_LOGO_TYPE_NONE) + logoApplyColorsDetected(instance); else //image successfull = logoPrintImageIfExists(instance, instance->config.logo.type);