diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-07 12:11:59 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-07 12:57:07 +0100 |
| commit | e760b307f6210bee293796d606bcca87f86be200 (patch) | |
| tree | 25cd2483a557cfc85e0ad1d81d1e453d1a7948b3 | |
| parent | 5fa7b07565d2c7c1edfb9a2f8c1af42d039d99ee (diff) | |
| download | bitcoin-e760b307f6210bee293796d606bcca87f86be200.tar.xz | |
qt: Use correct conversion function for boost::path datadir
Fixes #9089.
| -rw-r--r-- | src/qt/clientmodel.cpp | 3 | ||||
| -rw-r--r-- | src/qt/paymentserver.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 87704c641d..f9caca6878 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -6,6 +6,7 @@ #include "bantablemodel.h" #include "guiconstants.h" +#include "guiutil.h" #include "peertablemodel.h" #include "chainparams.h" @@ -208,7 +209,7 @@ QString ClientModel::formatClientStartupTime() const QString ClientModel::dataDir() const { - return QString::fromStdString(GetDataDir().string()); + return GUIUtil::boostPathToQString(GetDataDir()); } void ClientModel::updateBanlist() diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 9f23e77a13..478f5ccf12 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -80,7 +80,7 @@ static QString ipcServerName() // Append a simple hash of the datadir // Note that GetDataDir(true) returns a different path // for -testnet versus main net - QString ddir(QString::fromStdString(GetDataDir(true).string())); + QString ddir(GUIUtil::boostPathToQString(GetDataDir(true))); name.append(QString::number(qHash(ddir))); return name; |