[Refactoring] Move sysperms + enabled wallet check in wallet.cpp

PIVX-Project · May 7, 2021 · 6ab142b · 6ab142b
1 parent d8d723b
commit 6ab142b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -871,12 +871,7 @@ bool AppInitBasicSetup()
         return UIError("Error: Initializing networking failed");
 
 #ifndef WIN32
-    if (gArgs.GetBoolArg("-sysperms", false)) {
-#ifdef ENABLE_WALLET
-        if (!gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))
-            return UIError("Error: -sysperms is not allowed in combination with enabled wallet functionality");
-#endif
-    } else {
+    if (!gArgs.GetBoolArg("-sysperms", false)) {
         umask(077);
     }
 

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -650,6 +650,10 @@ bool CWallet::ParameterInteraction()
         return true;
     }
 
+    if (gArgs.GetBoolArg("-sysperms", false)) {
+        return UIError("-sysperms is not allowed in combination with enabled wallet functionality");
+    }
+
     if (gArgs.IsArgSet("-mintxfee")) {
         CAmount n = 0;
         if (ParseMoney(gArgs.GetArg("-mintxfee", ""), n) && n > 0)