create new address from main gui, move address book model to client model

1 files changed, 10 insertions, 4 deletions

diff --git a/gui/src/editaddressdialog.cpp b/gui/src/editaddressdialog.cpp
index ddc7292cc6..dd0541760b 100644
--- a/gui/src/editaddressdialog.cpp
+++ b/gui/src/editaddressdialog.cpp
@@ -54,16 +54,18 @@ void EditAddressDialog::loadRow(int row)
     mapper->setCurrentIndex(row);
 }
 
-void EditAddressDialog::saveCurrentRow()
+QString EditAddressDialog::saveCurrentRow()
 {
+    QString address;
     switch(mode)
     {
     case NewReceivingAddress:
     case NewSendingAddress:
-        if(!model->addRow(
+        address = model->addRow(
                 mode == NewSendingAddress ? AddressTableModel::Send : AddressTableModel::Receive,
                 ui->labelEdit->text(),
-                ui->addressEdit->text()))
+                ui->addressEdit->text());
+        if(address.isEmpty())
         {
             QMessageBox::warning(this, windowTitle(),
                 tr("The address %1 is already in the address book.").arg(ui->addressEdit->text()),
@@ -72,7 +74,11 @@ void EditAddressDialog::saveCurrentRow()
         break;
     case EditReceivingAddress:
     case EditSendingAddress:
-        mapper->submit();
+        if(mapper->submit())
+        {
+            address = ui->addressEdit->text();
+        }
         break;
     }
+    return address;
 }