Bitcoin-Qt: Fix display of window when bitcoin: URI is opened

WalletView:
- add new signal showNormalIfMinimized()
- emit the new signal in handleURI() to fix a bug, preventing the main
  window to show up when using bitcoin: URIs

Upstream: dbc0a6aba2cf94aa1b167145a18e0b9c671aef5b

3 files changed, 10 insertions, 0 deletions

diff --git a/src/qt/walletstack.cpp b/src/qt/walletstack.cpp
index 9e3060e86b..3576d55cea 100644
--- a/src/qt/walletstack.cpp
+++ b/src/qt/walletstack.cpp
@@ -13,6 +13,7 @@
 
 WalletStack::WalletStack(QWidget *parent) :
     QStackedWidget(parent),
+    gui(0),
     clientModel(0),
     bOutOfSync(true)
 {
@@ -35,6 +36,10 @@ bool WalletStack::addWallet(const QString& name, WalletModel *walletModel)
     walletView->showOutOfSyncWarning(bOutOfSync);
     addWidget(walletView);
     mapWalletViews[name] = walletView;
+
+    // Ensure a walletView is able to show the main window
+	connect(walletView, SIGNAL(showNormalIfMinimized()), gui, SLOT(showNormalIfMinimized()));
+
     return true;
 }
 
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 6d44c174b7..1de145c32d 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -203,6 +203,7 @@ bool WalletView::handleURI(const QString& strURI)
     if (sendCoinsPage->handleURI(strURI))
     {
         gotoSendCoinsPage();
+        emit showNormalIfMinimized();
         return true;
     }
     else
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index 6bcd70baf9..6ad5180d56 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -99,6 +99,10 @@ public slots:
     void unlockWallet();
 
     void setEncryptionStatus();
+
+signals:
+    /** Signal that we want to show the main window */
+    void showNormalIfMinimized();
 };
 
 #endif // WALLETVIEW_H