From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Wed, 5 Aug 2020 19:36:21 +0000 (+0530)
Subject: File colors is independent of context colors
X-Git-Tag: v3.4~28
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=5e3a79348096fc8781472f2accd1f37fc0eef577;p=nnn.git

File colors is independent of context colors
---

diff --git a/src/nnn.c b/src/nnn.c
index 6aa13f5b..6f434e1c 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -1661,11 +1661,14 @@ static bool initcurses(void *oldmask)
 		use_default_colors();
 
 		/* Initialize file colors */
-		if (COLORS >= 256 && !(g_state.oldcolor || init_fcolors())) {
-			exitcurses();
-			fprintf(stderr, "NNN_FCOLORS!\n");
-			return FALSE;
-		}
+		if (COLORS >= 256) {
+			if (!(g_state.oldcolor || init_fcolors())) {
+				exitcurses();
+				fprintf(stderr, "NNN_FCOLORS!\n");
+				return FALSE;
+			}
+		} else
+			g_state.oldcolor = 1;
 
 		if (colors && *colors == '#') {
 			char *sep = strchr(colors, ';');
@@ -1685,10 +1688,8 @@ static bool initcurses(void *oldmask)
 				colors = sep; /* Detect if 8 colors fallback is appended */
 				if (colors)
 					++colors;
-				g_state.oldcolor = 1;
 			}
-		} else
-			g_state.oldcolor = 1;
+		}
 
 		/* Get and set the context colors */
 		for (uchar i = 0; i <  CTX_MAX; ++i) {