diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-07 12:11:59 +0100 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-12-02 07:41:11 +0000 |
| commit | 5f3a12c97c25f811083679cd3f284059cf7ea54f (patch) | |
| tree | 2257a05cff5f6248744ad0eb3628707125f9e582 /src | |
| parent | 08d1c90113efb51d4fb2fcea36171181a66aea36 (diff) | |
| download | bitcoin-5f3a12c97c25f811083679cd3f284059cf7ea54f.tar.xz | |
qt: Use correct conversion function for boost::path datadir
Fixes #9089.
Github-Pull: #9094
Rebased-From: e760b307f6210bee293796d606bcca87f86be200
Diffstat (limited to 'src')
| -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 14661b857a..9530b63a27 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" @@ -186,7 +187,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 c80aebb009..96627710ee 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; |