Merge #421: Qt: Handle already existing wallet file on recover

ed825d5 Handle already existing wallet file on recover (Kristaps Kaupe)

Tree-SHA512: ca461377fb82ff64cced09ec27193ca27e81787cbff1d4e730f263aa54bd5bedd1aab7ed22ebb732802559d8989b781e7fb232f90d3299f2535f39e6d99025ab

scripts/joinmarket-qt.py

@@ -1492,17 +1492,22 @@ class JMMainWindow(QMainWindow):
         self.close()
 
     def recoverWallet(self):
-        success = wallet_generate_recover_bip39("recover", "wallets",
-                                                "wallet.jmdat",
-                                                callbacks=(None, self.seedEntry,
+        try:
+            success = wallet_generate_recover_bip39("recover", "wallets",
+                                                    "wallet.jmdat",
+                                                    callbacks=(None, self.seedEntry,
                                                            self.getPassword,
                                                            self.getWalletFileName))
-        if not success:
-            JMQtMessageBox(self,
+            if not success:
+                JMQtMessageBox(self,
                            "Failed to recover wallet.",
                            mbtype='warn',
                            title="Error")
+                return
+        except Exception as e:
+            JMQtMessageBox(self, e.args[0], title="Error", mbtype="warn")
             return
+
         JMQtMessageBox(self, 'Wallet saved to ' + self.walletname,
                                    title="Wallet created")
         self.initWallet(seed=self.walletname, restart_cb=self.restartWithMsg)