Delete 'userconfig' hash key after use to not pass to X invocation

TigerVNC · Mar 17, 2024 · 6305134 · 6305134
1 parent 119a5ff
commit 6305134
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in
@@ -120,7 +120,12 @@ $default_opts{pn} = undef;
 LoadConfig($vncSystemConfigDefaultsFile);
 
 # Then the user's settings (location overrideable by previous system defaults)
-LoadConfig($config{'userconfig'} || $vncUserConfig);
+if (exists $config{'userconfig'}) {
+  LoadConfig($config{'userconfig'});
+  delete $config{'userconfig'};
+} else {
+  LoadConfig($vncUserConfig);
+}
 
 # And then override anything set above if mandatory settings exist.
 # WARNING: "Mandatory" is used loosely here! As the man page says,