Module Name: src
Committed By: martin
Date: Wed Feb 21 20:31:57 UTC 2024
Modified Files:
src/usr.sbin/sysinst: main.c
Log Message:
Defer deletion of any color menu options untill the final menu (in the
selected language) has been loaded.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.32 src/usr.sbin/sysinst/main.c:1.33
--- src/usr.sbin/sysinst/main.c:1.32 Sun Dec 17 18:46:42 2023
+++ src/usr.sbin/sysinst/main.c Wed Feb 21 20:31:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2023/12/17 18:46:42 martin Exp $ */
+/* $NetBSD: main.c,v 1.33 2024/02/21 20:31:57 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -288,8 +288,6 @@ main(int argc, char **argv)
if (has_colors()) {
start_color();
do_coloring(clr_arg.fg,clr_arg.bg);
- } else {
- remove_color_options();
}
msg_window(mainwin);
@@ -310,6 +308,10 @@ main(int argc, char **argv)
get_kb_encoding();
init_lang();
+ /* remove some invalid menu entries */
+ if (!has_colors())
+ remove_color_options();
+
/* Menu processing */
if (partman_go)
partman(NULL);
