Skip to content

Commit b3e67f2

Browse files
committed
scripted-diff: Replace GetDataDir(true) calls with gArgs.GetDataDirNet() calls
-BEGIN VERIFY SCRIPT- git ls-files -- 'src' ':(exclude)src/util/system.h' ':(exclude)src/util/system.cpp' | xargs sed -i 's/GetDataDir(true)/gArgs.GetDataDirNet()/g'; -END VERIFY SCRIPT-
1 parent 4c3a5dc commit b3e67f2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ int GuiMain(int argc, char* argv[])
536536
if (!Intro::showIfNeeded(did_show_intro, prune_MiB)) return EXIT_SUCCESS;
537537

538538
/// 6. Determine availability of data directory and parse bitcoin.conf
539-
/// - Do not call GetDataDir(true) before this step finishes
539+
/// - Do not call gArgs.GetDataDirNet() before this step finishes
540540
if (!CheckDataDirOption()) {
541541
InitError(strprintf(Untranslated("Specified data directory \"%s\" does not exist.\n"), gArgs.GetArg("-datadir", "")));
542542
QMessageBox::critical(nullptr, PACKAGE_NAME,

src/qt/optionsmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void OptionsModel::Reset()
195195
QSettings settings;
196196

197197
// Backup old settings to chain-specific datadir for troubleshooting
198-
BackupSettings(GetDataDir(true) / "guisettings.ini.bak", settings);
198+
BackupSettings(gArgs.GetDataDirNet() / "guisettings.ini.bak", settings);
199199

200200
// Save the strDataDir setting
201201
QString dataDir = GUIUtil::getDefaultDataDirectory();

src/qt/paymentserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ static QString ipcServerName()
4949
QString name("BitcoinQt");
5050

5151
// Append a simple hash of the datadir
52-
// Note that GetDataDir(true) returns a different path
52+
// Note that gArgs.GetDataDirNet() returns a different path
5353
// for -testnet versus main net
54-
QString ddir(GUIUtil::boostPathToQString(GetDataDir(true)));
54+
QString ddir(GUIUtil::boostPathToQString(gArgs.GetDataDirNet()));
5555
name.append(QString::number(qHash(ddir)));
5656

5757
return name;

0 commit comments

Comments
 (0)