Skip to content

Commit cc50078

Browse files
committed
Set m_selected_wallet to empty before unloading
1 parent f8eb08f commit cc50078

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

qml/walletqmlcontroller.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
WalletQmlController::WalletQmlController(interfaces::Node& node, QObject *parent)
1717
: QObject(parent)
1818
, m_node(node)
19-
, m_selected_wallet(new WalletQmlModel(parent))
19+
, m_empty_wallet(new WalletQmlModel(this))
20+
, m_selected_wallet(m_empty_wallet)
2021
, m_worker(new QObject)
2122
, m_worker_thread(new QThread(this))
2223
{
@@ -35,6 +36,7 @@ WalletQmlController::~WalletQmlController()
3536
m_worker_thread->quit();
3637
m_worker_thread->wait();
3738
delete m_worker;
39+
delete m_empty_wallet;
3840
}
3941

4042
void WalletQmlController::setSelectedWallet(QString path)
@@ -63,6 +65,8 @@ WalletQmlModel* WalletQmlController::selectedWallet() const
6365
void WalletQmlController::unloadWallets()
6466
{
6567
m_handler_load_wallet->disconnect();
68+
m_selected_wallet = m_empty_wallet;
69+
Q_EMIT selectedWalletChanged();
6670
QMutexLocker locker(&m_wallets_mutex);
6771
for (WalletQmlModel* wallet : m_wallets) {
6872
delete wallet;

qml/walletqmlcontroller.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public Q_SLOTS:
5454

5555
bool m_initialized{false};
5656
interfaces::Node& m_node;
57+
WalletQmlModel* m_empty_wallet;
5758
WalletQmlModel* m_selected_wallet;
5859
QObject* m_worker;
5960
QThread* m_worker_thread;

0 commit comments

Comments
 (0)