sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4900 from UdjinM6/followup_4880

Browse Source 
fix(qt): fix crashes introduced by 15937 and 19099 backports
This commit is contained in:
UdjinM6 2022-07-05 17:36:56 +03:00 committed by GitHub
commit 22262137a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/forms/debugwindow.ui
View File

@ -1416,9 +1416,6 @@
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="wallet_path">
<property name="text">
<string>Wallet Path</string>
</property>
</widget>
</item>
<item row="3" column="0">

55
src/qt/rpcconsole.cpp
View File

@ -499,22 +499,6 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags
connect(ui->btn_upgradewallet, &QPushButton::clicked, this, &RPCConsole::walletUpgrade);
connect(ui->btn_reindex, &QPushButton::clicked, this, &RPCConsole::walletReindex);
#ifdef ENABLE_WALLET
// If there's no -wallet setting with a list of wallets to load, set it to
// load the default "" wallet.
if (!gArgs.IsArgSet("wallet")) {
gArgs.LockSettings([&](util::Settings& settings) {
util::SettingsValue wallets(util::SettingsValue::VARR);
wallets.push_back(""); // Default wallet name is ""
settings.rw_settings["wallet"] = wallets;
});
}
std::string walletName = gArgs.GetArgs("-wallet").at(0);
std::string walletPath = GetWalletDir().string();
walletPath += QDir::separator().toLatin1() + (walletName == "" ? "wallet.dat" : walletName);
ui->wallet_path->setText(QString::fromStdString(walletPath));
#endif
// Register RPC timer interface
rpcTimerInterface = new QtRPCTimerInterface();
// avoid accidentally overwriting an existing, non QTThread
@ -731,17 +715,27 @@ void RPCConsole::addWallet(WalletModel * const walletModel)
{
// use name for text and wallet model for internal data object (to allow to move to a wallet id later)
ui->WalletSelector->addItem(walletModel->getDisplayName(), QVariant::fromValue(walletModel));
if (ui->WalletSelector->count() == 2 && !isVisible()) {
// First wallet added, set to default so long as the window isn't presently visible (and potentially in use)
ui->WalletSelector->setCurrentIndex(1);
}
if (ui->WalletSelector->count() > 2) {
if (ui->WalletSelector->count() == 2) {
if (!isVisible()) {
// First wallet added, set to default so long as the window isn't presently visible (and potentially in use)
ui->WalletSelector->setCurrentIndex(1);
}
// The only loaded wallet
ui->btn_rescan1->setEnabled(true);
ui->btn_rescan2->setEnabled(true);
ui->btn_upgradewallet->setEnabled(true);
QString wallet_path = QString::fromStdString(GetWalletDir().string() + QDir::separator().toLatin1());
QString wallet_name = walletModel->getWalletName().isEmpty() ? "wallet.dat" : walletModel->getWalletName();
ui->wallet_path->setText(wallet_path + wallet_name);
} else {
ui->WalletSelector->setVisible(true);
ui->WalletSelectorLabel->setVisible(true);
// No wallet recovery for multiple loaded wallets
ui->btn_rescan1->setEnabled(false);
ui->btn_rescan2->setEnabled(false);
ui->btn_upgradewallet->setEnabled(false);
ui->wallet_path->clear();
}
ui->btn_rescan1->setEnabled(true);
ui->btn_rescan2->setEnabled(true);
ui->btn_upgradewallet->setEnabled(true);
}
void RPCConsole::removeWallet(WalletModel * const walletModel)
@ -750,11 +744,20 @@ void RPCConsole::removeWallet(WalletModel * const walletModel)
if (ui->WalletSelector->count() == 2) {
ui->WalletSelector->setVisible(false);
ui->WalletSelectorLabel->setVisible(false);
}
if (ui->WalletSelector->count() == 1) {
// Back to the only loaded wallet
ui->btn_rescan1->setEnabled(true);
ui->btn_rescan2->setEnabled(true);
ui->btn_upgradewallet->setEnabled(true);
WalletModel* wallet_model = ui->WalletSelector->itemData(1).value<WalletModel*>();
QString wallet_path = QString::fromStdString(GetWalletDir().string() + QDir::separator().toLatin1());
QString wallet_name = wallet_model->getWalletName().isEmpty() ? "wallet.dat" : wallet_model->getWalletName();
ui->wallet_path->setText(wallet_path + wallet_name);
} else {
// No wallet recovery for multiple loaded wallets
ui->btn_rescan1->setEnabled(false);
ui->btn_rescan2->setEnabled(false);
ui->btn_upgradewallet->setEnabled(false);
ui->wallet_path->clear();
}
}
#endif

6
src/qt/splashscreen.cpp
View File

@ -17,6 +17,7 @@
#include <interfaces/wallet.h>
#include <qt/guiutil.h>
#include <qt/networkstyle.h>
#include <qt/walletmodel.h>
#include <ui_interface.h>
#include <util/system.h>
#include <util/translation.h>
@ -187,6 +188,7 @@ void SplashScreen::subscribeToCoreSignals()
void SplashScreen::handleLoadWallet()
{
#ifdef ENABLE_WALLET
if (!WalletModel::isWalletEnabled()) return;
m_handler_load_wallet = m_node.walletClient().handleLoadWallet([this](std::unique_ptr<interfaces::Wallet> wallet) {
m_connected_wallet_handlers.emplace_back(wallet->handleShowProgress(std::bind(ShowProgress, this, std::placeholders::_1, std::placeholders::_2, false)));
m_connected_wallets.emplace_back(std::move(wallet));
@ -200,7 +202,9 @@ void SplashScreen::unsubscribeFromCoreSignals()
m_handler_init_message->disconnect();
m_handler_show_progress->disconnect();
#ifdef ENABLE_WALLET
m_handler_load_wallet->disconnect();
if (m_handler_load_wallet != nullptr) {
m_handler_load_wallet->disconnect();
}
#endif // ENABLE_WALLET
for (const auto& handler : m_connected_wallet_handlers) {
handler->disconnect();