Revert "Ensure ringdb is written after wallet creation"

This reverts commit d52df3b94e.

Regression: must ensure wallet is stored before opening it again.
This commit is contained in:
tobtoht
2022-06-26 15:39:09 +02:00
parent 1e4e9a2674
commit b1c447519e
2 changed files with 6 additions and 7 deletions
+1 -2
View File
@@ -279,8 +279,7 @@ void WindowManager::tryCreateWallet(Seed seed, const QString &path, const QStrin
wallet->setCacheAttribute("feather.seed", seed.mnemonic.join(" ")); wallet->setCacheAttribute("feather.seed", seed.mnemonic.join(" "));
wallet->setCacheAttribute("feather.seedoffset", seedOffset); wallet->setCacheAttribute("feather.seedoffset", seedOffset);
wallet->deleteLater(); this->onWalletOpened(wallet);
this->tryOpenWallet(path, password);
} }
void WindowManager::tryCreateWalletFromDevice(const QString &path, const QString &password, const QString &deviceName, int restoreHeight) void WindowManager::tryCreateWalletFromDevice(const QString &path, const QString &password, const QString &deviceName, int restoreHeight)
+5 -5
View File
@@ -1413,18 +1413,18 @@ Wallet::~Wallet()
m_scheduler.shutdownWaitForFinished(); m_scheduler.shutdownWaitForFinished();
if (status() == Status_Critical || status() == Status_BadPassword) //Monero::WalletManagerFactory::getWalletManager()->closeWallet(m_walletImpl);
if(status() == Status_Critical || status() == Status_BadPassword)
qDebug("Not storing wallet cache"); qDebug("Not storing wallet cache");
else if (m_walletImpl->store("")) else if( m_walletImpl->store(""))
qDebug("Wallet cache stored successfully"); qDebug("Wallet cache stored successfully");
else else
qDebug("Error storing wallet cache"); qDebug("Error storing wallet cache");
delete m_walletImpl; delete m_walletImpl;
m_walletImpl = nullptr; m_walletImpl = nullptr;
delete m_walletListener; delete m_walletListener;
m_walletListener = nullptr; m_walletListener = NULL;
qDebug("~Wallet: Closed"); qDebug("m_walletImpl deleted");
} }
void Wallet::startRefreshThread() void Wallet::startRefreshThread()