nnn

commit 5e3a79348096fc8781472f2accd1f37fc0eef577
parent 8ddc659df8c63ad4caf7d7a629d297106f9348ef
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Thu,  6 Aug 2020 01:06:21 +0530

File colors is independent of context colors

Diffstat:
M
src/nnn.c
 | 
17
+++++++++--------

1 file changed, 9 insertions(+), 8 deletions(-)
diff --git 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) {