move $NO_COLOR check to main()

BurntRanch · Apr 16, 2024 · c063e56 · c063e56
1 parent f378da7
commit c063e56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/include/fmt/color.h b/include/fmt/color.h
@@ -446,9 +446,6 @@ template <typename Char>
 void vformat_to(
     buffer<Char>& buf, const text_style& ts, basic_string_view<Char> format_str,
     basic_format_args<buffered_context<type_identity_t<Char>>> args) {
-  char *no_color = getenv("NO_COLOR");
-  if (no_color != NULL && no_color[0] != '\0')
-      disable_colors = true;
 
   if (disable_colors) {
     detail::vformat_to(buf, format_str, args, {});

diff --git a/src/main.cpp b/src/main.cpp
@@ -403,7 +403,8 @@ int parseargs(int argc, char* argv[]) {
 // main
 int main(int argc, char* argv[]) {
     config = std::make_unique<Config>();
-
+    char *no_color = getenv("NO_COLOR");
+
     configfile = (getConfigDir() + "/config.toml");
     themefile = (getConfigDir() + "/theme.toml");
 
@@ -414,7 +415,10 @@ int main(int argc, char* argv[]) {
     // i just want to feel good about having this check
     config->init(configfile, themefile);
 
-    fmt::disable_colors = config->colors == 0;
+    fmt::disable_colors = config->colors == false;
+    if (no_color != NULL && no_color[0] != '\0')
+      fmt::disable_colors = true;
+
 
     if(op.test_colors) {
         test_colors();