Skip to content

Commit 6f6fde3

Browse files
committed
qt, refactor: Keep EditAddressDialog in the main event loop
1 parent 59f7ba4 commit 6f6fde3

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/qt/addressbookpage.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ void AddressBookPage::onEditAction()
182182
if(indexes.isEmpty())
183183
return;
184184

185-
EditAddressDialog dlg(
185+
auto dlg = new EditAddressDialog(
186186
tab == SendingTab ?
187187
EditAddressDialog::EditSendingAddress :
188188
EditAddressDialog::EditReceivingAddress, this);
189-
dlg.setModel(model);
189+
dlg->setModel(model);
190190
QModelIndex origIndex = proxyModel->mapToSource(indexes.at(0));
191-
dlg.loadRow(origIndex.row());
192-
dlg.exec();
191+
dlg->loadRow(origIndex.row());
192+
GUIUtil::ShowModalDialogAndDeleteOnClose(dlg);
193193
}
194194

195195
void AddressBookPage::on_newAddress_clicked()

src/qt/transactionview.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,22 @@ void TransactionView::editLabel()
500500
// Determine type of address, launch appropriate editor dialog type
501501
QString type = modelIdx.data(AddressTableModel::TypeRole).toString();
502502

503-
EditAddressDialog dlg(
503+
auto dlg = new EditAddressDialog(
504504
type == AddressTableModel::Receive
505505
? EditAddressDialog::EditReceivingAddress
506506
: EditAddressDialog::EditSendingAddress, this);
507-
dlg.setModel(addressBook);
508-
dlg.loadRow(idx);
509-
dlg.exec();
507+
dlg->setModel(addressBook);
508+
dlg->loadRow(idx);
509+
GUIUtil::ShowModalDialogAndDeleteOnClose(dlg);
510510
}
511511
else
512512
{
513513
// Add sending address
514-
EditAddressDialog dlg(EditAddressDialog::NewSendingAddress,
514+
auto dlg = new EditAddressDialog(EditAddressDialog::NewSendingAddress,
515515
this);
516-
dlg.setModel(addressBook);
517-
dlg.setAddress(address);
518-
dlg.exec();
516+
dlg->setModel(addressBook);
517+
dlg->setAddress(address);
518+
GUIUtil::ShowModalDialogAndDeleteOnClose(dlg);
519519
}
520520
}
521521
}

0 commit comments

Comments
 (0)