From 15e6e13624e3bd322db67861ec27bd5f9d18b6e8 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <dev@jonasschnelli.ch>
Date: Sat, 5 Mar 2016 16:08:10 -0500
Subject: [Wallet] optimize return value of InitLoadWallet()

---
 src/init.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/init.cpp')

diff --git a/src/init.cpp b/src/init.cpp
index 0fd8de08c..ba9860014 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1427,12 +1427,15 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         std::string warningString;
         std::string errorString;
         pwalletMain = CWallet::InitLoadWallet(fDisableWallet, strWalletFile, warningString, errorString);
-        if (!pwalletMain)
-            return false;
         if (!warningString.empty())
             InitWarning(warningString);
         if (!errorString.empty())
+        {
+            LogPrintf("%s", errorString);
             return InitError(errorString);
+        }
+        if (!pwalletMain)
+            return false;
     }
 #else // ENABLE_WALLET
     LogPrintf("No wallet support compiled in!\n");
-- 
cgit v1.2.3