Merge pull request #6103
4b384003
wallet2: don't try to lock an empty filename (moneromooo-monero)
This commit is contained in:
commit
995f34b538
|
@ -7576,6 +7576,8 @@ bool wallet2::is_output_blackballed(const std::pair<uint64_t, uint64_t> &output)
|
|||
|
||||
bool wallet2::lock_keys_file()
|
||||
{
|
||||
if (m_wallet_file.empty())
|
||||
return true;
|
||||
if (m_keys_file_locker)
|
||||
{
|
||||
MDEBUG(m_keys_file << " is already locked.");
|
||||
|
@ -7587,6 +7589,8 @@ bool wallet2::lock_keys_file()
|
|||
|
||||
bool wallet2::unlock_keys_file()
|
||||
{
|
||||
if (m_wallet_file.empty())
|
||||
return true;
|
||||
if (!m_keys_file_locker)
|
||||
{
|
||||
MDEBUG(m_keys_file << " is already unlocked.");
|
||||
|
@ -7598,6 +7602,8 @@ bool wallet2::unlock_keys_file()
|
|||
|
||||
bool wallet2::is_keys_file_locked() const
|
||||
{
|
||||
if (m_wallet_file.empty())
|
||||
return false;
|
||||
return m_keys_file_locker->locked();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue