瀏覽代碼

qt: Only override -datadir if different from the default

Fixes #3905.
tags/v0.15.1
Wladimir J. van der Laan 7 年之前
父節點
當前提交
c61fe44194
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6
    1
      src/qt/intro.cpp

+ 6
- 1
src/qt/intro.cpp 查看文件

@@ -189,7 +189,12 @@ void Intro::pickDataDirectory()

settings.setValue("strDataDir", dataDir);
}
SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
/* Only override -datadir if different from the default, to make it possible to
* override -datadir in the bitcoin.conf file in the default data directory
* (to be consistent with bitcoind behavior)
*/
if(dataDir != getDefaultDataDirectory())
SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
}

void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable)

Loading…
取消
儲存