diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2017-10-22 12:56:01 +0200 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2017-10-29 15:17:31 +0100 |
| commit | 867b67c4fd6490381dbe061df52ec75725da8f43 (patch) | |
| tree | 177681b7c9c16b6651046861608a1ec4ed785e64 | |
| parent | Merge pull request #2601 (diff) | |
| download | monero-867b67c4fd6490381dbe061df52ec75725da8f43.tar.xz | |
Wallet API: override update subdir when built from src
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2_api.h | 2 |
2 files changed, 4 insertions, 2 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; diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index 4d734ab94..12dd8c859 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -869,7 +869,7 @@ struct WalletManager virtual std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const = 0; //! checks for an update and returns version, hash and url - static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, const std::string &subdir); + static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, std::string subdir); }; |