diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-02-20 15:25:00 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-02-20 15:25:03 -0500 |
| commit | e117cfe45eee9169409e74a44ef4a866be25bc35 (patch) | |
| tree | cf5fb71a3d464670d600908d5687cb16bd1d7bc5 /src/qt | |
| parent | ffc6e48b2983189dc0ce7de0a038e5329bc07b1b (diff) | |
| parent | a6e6e39a8baf0756240427cc5dc5fce5aea51f0d (diff) | |
| download | bitcoin-e117cfe45eee9169409e74a44ef4a866be25bc35.tar.xz | |
Merge #12489: Bugfix: respect user defined configuration file (-conf) in QT settings
a6e6e39a8b 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
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/guiutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index edf1c29ea1..a46e0561b9 100644 --- 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); |