qt: Use correct conversion function for boost::path datadir

Fixes #9089.

Github-Pull: #9094
Rebased-From: e760b307f6210bee293796d606bcca87f86be200
This commit is contained in:
Wladimir J. van der Laan 2016-11-07 12:11:59 +01:00 committed by Luke Dashjr
parent 08d1c90113
commit 5f3a12c97c
2 changed files with 3 additions and 2 deletions

View File

@ -6,6 +6,7 @@
#include "bantablemodel.h" #include "bantablemodel.h"
#include "guiconstants.h" #include "guiconstants.h"
#include "guiutil.h"
#include "peertablemodel.h" #include "peertablemodel.h"
#include "chainparams.h" #include "chainparams.h"
@ -186,7 +187,7 @@ QString ClientModel::formatClientStartupTime() const
QString ClientModel::dataDir() const QString ClientModel::dataDir() const
{ {
return QString::fromStdString(GetDataDir().string()); return GUIUtil::boostPathToQString(GetDataDir());
} }
void ClientModel::updateBanlist() void ClientModel::updateBanlist()

View File

@ -80,7 +80,7 @@ static QString ipcServerName()
// Append a simple hash of the datadir // Append a simple hash of the datadir
// Note that GetDataDir(true) returns a different path // Note that GetDataDir(true) returns a different path
// for -testnet versus main net // for -testnet versus main net
QString ddir(QString::fromStdString(GetDataDir(true).string())); QString ddir(GUIUtil::boostPathToQString(GetDataDir(true)));
name.append(QString::number(qHash(ddir))); name.append(QString::number(qHash(ddir)));
return name; return name;