nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6103

Browse Source 
4b384003 wallet2: don't try to lock an empty filename (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-06 00:33:17 -08:00
commit 995f34b538
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/wallet2.cpp
View File

@ -7576,6 +7576,8 @@ bool wallet2::is_output_blackballed(const std::pair<uint64_t, uint64_t> &output)
bool wallet2::lock_keys_file() bool wallet2::lock_keys_file()
{ {
if (m_wallet_file.empty())
return true;
if (m_keys_file_locker) if (m_keys_file_locker)
{ {
MDEBUG(m_keys_file << " is already locked."); MDEBUG(m_keys_file << " is already locked.");
@ -7587,6 +7589,8 @@ bool wallet2::lock_keys_file()
bool wallet2::unlock_keys_file() bool wallet2::unlock_keys_file()
{ {
if (m_wallet_file.empty())
return true;
if (!m_keys_file_locker) if (!m_keys_file_locker)
{ {
MDEBUG(m_keys_file << " is already unlocked."); MDEBUG(m_keys_file << " is already unlocked.");
@ -7598,6 +7602,8 @@ bool wallet2::unlock_keys_file()
bool wallet2::is_keys_file_locked() const bool wallet2::is_keys_file_locked() const
{ {
if (m_wallet_file.empty())
return false;
return m_keys_file_locker->locked(); return m_keys_file_locker->locked();
} }