Merge branch 'fix-envvar-precedence' of https://github.com/sotpapathe…

…/ncmpc
MusicPlayerDaemon · Sep 11, 2024 · 985af17 · 985af17
2 parents 236b33c + 1e15a0c
commit 985af17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -7,6 +7,7 @@ ncmpc 0.50 - not yet released
 * lyrics/musixmatch: add new lyrics extension
 * lyrics/google: fix partial loading of lyrics
 * support MPD 0.22 tag "label" (requires libmpdclient 2.17)
+* fix config file overriding MPD_HOST environment variable
 
 ncmpc 0.49 - (2023-08-04)
 * fix UI freeze if lyrics plugin is stuck

diff --git a/src/Main.cxx b/src/Main.cxx
@@ -288,6 +288,9 @@ try {
 	GetGlobalKeyBindings().Check(nullptr, 0);
 #endif
 
+	/* set options from environment variables */
+	options_env();
+
 	/* parse command line options - 2 pass */
 	options_parse(argc, argv);
 

diff --git a/src/Options.cxx b/src/Options.cxx
@@ -321,7 +321,11 @@ options_parse(int argc, const char *argv[])
 		handle_option(opt->shortopt, nullptr);
 	else if (opt && opt->argument)
 		option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
+}
 
-	if (options.host.empty() && getenv("MPD_HOST"))
+void
+options_env()
+{
+	if (getenv("MPD_HOST"))
 		options.host = getenv("MPD_HOST");
 }
diff --git a/src/Options.hxx b/src/Options.hxx
@@ -78,3 +78,5 @@ struct Options {
 extern Options options;
 
 void options_parse(int argc, const char **argv);
+
+void options_env();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,3 +78,5 @@ struct Options {
		extern Options options;

		void options_parse(int argc, const char **argv);

		void options_env();