aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-07-08 23:00:38 +0200
committerRiccardo Spagni <ric@spagni.net>2016-07-08 23:00:38 +0200
commit18dd50702407ece54a98563921fa744c6b7c15b2 (patch)
treeec6e76a7cb7d60dc3ccc7dee8e1e16a26603f1d9
parentMerge pull request #885 (diff)
parentwallet2_api: make this build (smatch needs .str() for /=) (diff)
downloadmonero-18dd50702407ece54a98563921fa744c6b7c15b2.tar.xz
Merge pull request #889
a0bf85d wallet2_api: make this build (smatch needs .str() for /=) (moneromooo-monero)
Diffstat (limited to '')
-rw-r--r--src/wallet/api/wallet_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index 4ed6e09fb..bf072ccca 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -101,7 +101,7 @@ std::vector<std::string> WalletManagerImpl::findWallets(const std::string &path)
bool matched = boost::regex_match(filename, what, wallet_rx);
if (matched) {
// if keys file found, checking if there's wallet file itself
- std::string wallet_file = (itr->path().parent_path() /= what[1]).string();
+ std::string wallet_file = (itr->path().parent_path() /= what[1].str()).string();
if (boost::filesystem::exists(wallet_file)) {
LOG_PRINT_L3("Found wallet: " << wallet_file);
result.push_back(wallet_file);