diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index c0a5e4780..4ac59d718 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -597,7 +597,8 @@ bool WalletImpl::recoverFromDevice(const std::string &path, const std::string &p LOG_PRINT_L1("Generated new wallet from device: " + device_name); } catch (const std::exception& e) { - setStatusError(string(tr("failed to generate new wallet: ")) + e.what()); + m_errorString = string(tr("failed to generate new wallet: ")) + e.what(); + m_status = Status_Error; return false; } return true; diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 6ad372357..0801f7b23 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -116,8 +116,8 @@ public: void setRefreshFromBlockHeight(uint64_t refresh_from_block_height); uint64_t getRefreshFromBlockHeight() const { return m_wallet->get_refresh_from_block_height(); }; void setRecoveringFromSeed(bool recoveringFromSeed); - void setRecoveringFromDevice(bool recoveringFromDevice) override; - void setSubaddressLookahead(uint32_t major, uint32_t minor) override; + void setRecoveringFromDevice(bool recoveringFromDevice); + void setSubaddressLookahead(uint32_t major, uint32_t minor); bool watchOnly() const; bool rescanSpent(); NetworkType nettype() const {return static_cast(m_wallet->nettype());} diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h index 19aad9ee3..18c0740d9 100644 --- a/src/wallet/api/wallet_manager.h +++ b/src/wallet/api/wallet_manager.h @@ -69,7 +69,7 @@ public: NetworkType nettype, const std::string &deviceName, uint64_t restoreHeight = 0, - const std::string &subaddressLookahead = "") override; + const std::string &subaddressLookahead = ""); virtual bool closeWallet(Wallet *wallet, bool store = true); bool walletExists(const std::string &path); bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key) const;