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

Fixes #9089.
This commit is contained in:
Wladimir J. van der Laan
2016-11-07 12:11:59 +01:00
committed by lateminer
parent 49ac458e35
commit ea3b89d1c4
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 "alert.h" #include "alert.h"
@@ -198,7 +199,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

@@ -85,7 +85,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;