Net/Qt: fix Tor reconnect state and receive request crash

src/qt/receivecoinsdialog.cpp

@@ -206,7 +206,7 @@ void ReceiveCoinsDialog::on_receiveButton_clicked()
         ui->reqAmount->value(), ui->reqMessage->text());
     ReceiveRequestDialog *dialog = new ReceiveRequestDialog(this);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->setModel(model->getOptionsModel());
+    dialog->setModel(model);
     dialog->setInfo(info);
     dialog->show();
     clear();
@@ -220,7 +220,7 @@ void ReceiveCoinsDialog::on_recentRequestsView_doubleClicked(const QModelIndex &
     QModelIndex targetIdx = recentRequestsProxyModel->mapToSource(index);
     const RecentRequestsTableModel *submodel = model->getRecentRequestsTableModel();
     ReceiveRequestDialog *dialog = new ReceiveRequestDialog(this);
-    dialog->setModel(model->getOptionsModel());
+    dialog->setModel(model);
     dialog->setInfo(submodel->entry(targetIdx.row()).recipient);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->show();

src/qt/receiverequestdialog.cpp

@@ -90,7 +90,8 @@ void QRImageWidget::contextMenuEvent(QContextMenuEvent *event)
 ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ReceiveRequestDialog),
-    model(0)
+    model(0),
+    walletModel(0)
 {
     ui->setupUi(this);
 
@@ -107,12 +108,13 @@ ReceiveRequestDialog::~ReceiveRequestDialog()
     delete ui;
 }
 
-void ReceiveRequestDialog::setModel(OptionsModel *_model)
+void ReceiveRequestDialog::setModel(WalletModel *_model)
 {
-    this->model = _model;
+    this->walletModel = _model;
+    this->model = _model ? _model->getOptionsModel() : 0;
 
-    if (_model)
-        connect(_model, &OptionsModel::displayUnitChanged, this, &ReceiveRequestDialog::update);
+    if (model)
+        connect(model, &OptionsModel::displayUnitChanged, this, &ReceiveRequestDialog::update);
 
     // update the display unit if necessary
     update();
@@ -126,7 +128,7 @@ void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &_info)
 
 void ReceiveRequestDialog::update()
 {
-    if(!model)
+    if(!model || !walletModel)
         return;
     resize(width(), 600);
     QString target = info.label;

src/qt/receiverequestdialog.h

@@ -53,7 +53,7 @@ class ReceiveRequestDialog : public QDialog
     explicit ReceiveRequestDialog(QWidget *parent = 0);
     ~ReceiveRequestDialog();
 
-    void setModel(OptionsModel *model);
+    void setModel(WalletModel *model);
     void setInfo(const SendCoinsRecipient &info);
 
 private Q_SLOTS:

src/torcontrol.cpp

@@ -231,6 +231,8 @@ bool TorControlConnection::Disconnect()
     if (b_conn)
         bufferevent_free(b_conn);
     b_conn = 0;
+    message.Clear();
+    reply_handlers.clear();
     return true;
 }