From 48300429af30ceeefef6a4af0a6cd6d0376751e8 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Tue, 27 Sep 2022 15:02:35 +0200
Subject: [PATCH] Keep detected colors when using none logo #264

---
 src/logo/builtin.c | 12 ------------
 src/logo/logo.c    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index d9dbbdd0e..991115c0b 100644
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@@ -38,17 +38,6 @@ const FFlogo* ffLogoBuiltinGetUnknown()
     FF_LOGO_RETURN
 }
 
-static const FFlogo* getLogoNone()
-{
-    FF_LOGO_INIT
-    FF_LOGO_NAMES("none", "empty")
-    FF_LOGO_LINES("")
-    FF_LOGO_COLORS("")
-    FF_LOGO_COLOR_KEYS("")
-    FF_LOGO_COLOR_TITLE("")
-    FF_LOGO_RETURN
-}
-
 static const FFlogo* getLogoAlmaLinux()
 {
     FF_LOGO_INIT
@@ -1985,7 +1974,6 @@ GetLogoMethod* ffLogoBuiltinGetAll()
 {
     static GetLogoMethod logoMethods[] = {
         ffLogoBuiltinGetUnknown,
-        getLogoNone,
         getLogoAlmaLinux,
         getLogoAlpine,
         getLogoAlpineSmall,
diff --git a/src/logo/logo.c b/src/logo/logo.c
index e0ec11da8..e0340d571 100644
--- a/src/logo/logo.c
+++ b/src/logo/logo.c
@@ -236,13 +236,27 @@ static void logoPrintStruct(FFinstance* instance, const FFlogo* logo)
     ffLogoPrintChars(instance, logo->data, true);
 }
 
+static void logoPrintNone(FFinstance* instance)
+{
+    logoApplyColorsDetected(instance);
+    instance->state.logoHeight = 0;
+    instance->state.logoWidth = 0;
+}
+
 static bool logoPrintBuiltinIfExists(FFinstance* instance, const char* name)
 {
+    if(strcasecmp(name, "none") == 0)
+    {
+        logoPrintNone(instance);
+        return true;
+    }
+
     const FFlogo* logo = logoGetBuiltin(name);
     if(logo == NULL)
         return false;
 
     logoPrintStruct(instance, logo);
+
     return true;
 }