Merge pull request #3892

b8edf6c Qt: Fix ESC in disablewallet mode (Wladimir J. van der Laan)

src/qt/rpcconsole.cpp

@@ -331,6 +331,13 @@ void RPCConsole::clear()
                         tr("Type <b>help</b> for an overview of available commands.")), true);
 }
 
+void RPCConsole::reject()
+{
+    // Ignore escape keypress if this is not a seperate window
+    if(windowType() != Qt::Widget)
+        QDialog::reject();
+}
+
 void RPCConsole::message(int category, const QString &message, bool html)
 {
     QTime time = QTime::currentTime();

src/qt/rpcconsole.h

@@ -47,6 +47,7 @@ private slots:
 
 public slots:
     void clear();
+    void reject();
     void message(int category, const QString &message, bool html = false);
     /** Set number of connections shown in the UI */
     void setNumConnections(int count);