aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentserver.cpp
diff options
context:
space:
mode:
authorJonas Schnelli <[email protected]>2016-11-07 14:16:54 +0100
committerJonas Schnelli <[email protected]>2016-11-07 14:20:12 +0100
commit78cdd643d3172f78146c4f60ec9ffcf0beb32a90 (patch)
tree48fad3517899d8b871942eddcb8fe252ffafb484 /src/qt/paymentserver.cpp
parentMerge #8981: Wshadow: Do not shadow argument with a local variable (diff)
parentqt: Use correct conversion function for boost::path datadir (diff)
downloaddiscoin-78cdd643d3172f78146c4f60ec9ffcf0beb32a90.tar.xz
discoin-78cdd643d3172f78146c4f60ec9ffcf0beb32a90.zip
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)
Diffstat (limited to 'src/qt/paymentserver.cpp')
-rw-r--r--src/qt/paymentserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 9f23e77a1..478f5ccf1 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -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;