Merge #12489: Bugfix: respect user defined configuration file (-conf) in QT settings

MarcoFalke · MarcoFalke · commit e117cfe45eee · 2018-02-20T15:25:03.000-05:00
a6e6e39 Bugfix: respect user defined configuration file (-conf) when open conf. file from QT settings (Jonas Schnelli) Pull request description: Fixes #12488. In master, opening the configuration file from the GUI settings will always open the file "bitcoin.conf" regardless of the `-conf=` settings. This PR makes the GUI settings open configuration file function respect the `-conf` option. Tree-SHA512: fb54cc699b4d2a3947f749fdf5f1a51251ffd67d0f6c6a937a5b80f0ba5a5c1085d0eef190453bbc04696d4d76c2c266de0fe9712e65e4bb36116158b54263d4
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -417,7 +417,7 @@ void openDebugLogfile()
 
 bool openBitcoinConf()
 {
-    boost::filesystem::path pathConfig = GetConfigFile(BITCOIN_CONF_FILENAME);
+    boost::filesystem::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));
 
     /* Create the file */
     boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app);

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ void openDebugLogfile()`
`417`	`417`
`418`	`418`	`bool openBitcoinConf()`
`419`	`419`	`{`
`420`		`- boost::filesystem::path pathConfig = GetConfigFile(BITCOIN_CONF_FILENAME);`
	`420`	`+ boost::filesystem::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));`
`421`	`421`
`422`	`422`	`/* Create the file */`
`423`	`423`	`boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app);`