Qt: load wallet in UI after possible init aborts

jonasschnelli · jonasschnelli · commit 3a03d2a33fec · 2018-06-19T21:33:13.000+02:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4095,8 +4095,6 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
         }
     }
 
-    uiInterface.LoadWallet(walletInstance);
-
     int prev_version = walletInstance->nWalletVersion;
     if (gArgs.GetBoolArg("-upgradewallet", fFirstRun))
     {
@@ -4346,6 +4344,8 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
         }
     }
 
+    uiInterface.LoadWallet(walletInstance);
+
     // Register with the validation interface. It's ok to do this after rescan since we're still holding cs_main.
     RegisterValidationInterface(walletInstance.get());
 

Original file line number	Diff line number	Diff line change
`@@ -4095,8 +4095,6 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,`
`4095`	`4095`	`}`
`4096`	`4096`	`}`
`4097`	`4097`
`4098`		`- uiInterface.LoadWallet(walletInstance);`
`4099`		`-`
`4100`	`4098`	`int prev_version = walletInstance->nWalletVersion;`
`4101`	`4099`	`if (gArgs.GetBoolArg("-upgradewallet", fFirstRun))`
`4102`	`4100`	`{`
`@@ -4346,6 +4344,8 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,`
`4346`	`4344`	`}`
`4347`	`4345`	`}`
`4348`	`4346`
	`4347`	`+ uiInterface.LoadWallet(walletInstance);`
	`4348`	`+`
`4349`	`4349`	`// Register with the validation interface. It's ok to do this after rescan since we're still holding cs_main.`
`4350`	`4350`	`RegisterValidationInterface(walletInstance.get());`
`4351`	`4351`