aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-11-14 15:15:25 +0200
committerRiccardo Spagni <ric@spagni.net>2017-11-14 15:15:25 +0200
commitcdab85db413afdcd0c0e23c9a944bde2c8450ac5 (patch)
treefc936e55b625cf0b14f671b100832607aab31583 /src/wallet/api
parentMerge pull request #2697 (diff)
parentWallet API: override update subdir when built from src (diff)
downloadmonero-cdab85db413afdcd0c0e23c9a944bde2c8450ac5.tar.xz
Merge pull request #2701
867b67c4 Wallet API: override update subdir when built from src (Jaquee)
Diffstat (limited to 'src/wallet/api')
-rw-r--r--src/wallet/api/wallet_manager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index a64766c84..2326f54d3 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -434,12 +434,14 @@ std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool
return addresses.front();
}
-std::tuple<bool, std::string, std::string, std::string, std::string> WalletManager::checkUpdates(const std::string &software, const std::string &subdir)
+std::tuple<bool, std::string, std::string, std::string, std::string> WalletManager::checkUpdates(const std::string &software, std::string subdir)
{
#ifdef BUILD_TAG
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
#else
static const char buildtag[] = "source";
+ // Override the subdir string when built from source
+ subdir = "source";
#endif
std::string version, hash;