Skip to content
Permalink
Browse files

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

Fixes #9089.

Github-Pull: #9094
Rebased-From: e760b30
  • Loading branch information...
laanwj authored and luke-jr committed Nov 7, 2016
1 parent 08d1c90 commit 5f3a12c97c25f811083679cd3f284059cf7ea54f
Showing with 3 additions and 2 deletions.
  1. +2 −1 src/qt/clientmodel.cpp
  2. +1 −1 src/qt/paymentserver.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()
@@ -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;

0 comments on commit 5f3a12c

Please sign in to comment.
You can’t perform that action at this time.