LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

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

Browse source 
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
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 "bantablemodel.h"
#include "guiconstants.h" #include "guiconstants.h"
#include "guiutil.h"
#include "peertablemodel.h" #include "peertablemodel.h"
#include "chainparams.h" #include "chainparams.h"
@ -208,7 +209,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()

2
src/qt/paymentserver.cpp
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;