BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #9094: qt: Use correct conversion function for boost::path datadir 

e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)
This commit is contained in:
Jonas Schnelli 2016-11-07 14:16:54 +01:00
parent 0b2322b144 e760b307f6
commit 78cdd643d3
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/clientmodel.cpp
View File

@ -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()

2
src/qt/paymentserver.cpp
View File

@ -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;