[Wallet] optimize return value of InitLoadWallet()

2016-03-05 16:08:10 -05:00
parent fc7c60d699
commit 15e6e13624
2 changed files with 16 additions and 5 deletions
--- 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");