qml: Fix conflicts with bitcoin/bitcoin#27170

hebasto · hebasto · commit 372c571fda26 · 2023-04-23T21:22:42.000+01:00
diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp
@@ -109,7 +109,7 @@ bool ConfigurationFileExists(ArgsManager& argsman)
     }
 
     const fs::path rel_config_path = argsman.GetPathArg("-conf", BITCOIN_CONF_FILENAME);
-    const fs::path abs_config_path = AbsPathForConfigVal(rel_config_path, true);
+    const fs::path abs_config_path = AbsPathForConfigVal(argsman, rel_config_path, true);
     if (fs::exists(abs_config_path)) {
         return true;
     }
@@ -169,7 +169,7 @@ int QmlGuiMain(int argc, char* argv[])
     app.setApplicationName(QAPP_APP_NAME_DEFAULT);
 
     /// Determine availability of data directory.
-    if (!CheckDataDirOption()) {
+    if (!CheckDataDirOption(gArgs)) {
         InitError(strprintf(Untranslated("Specified data directory \"%s\" does not exist.\n"), gArgs.GetArg("-datadir", "")));
         return EXIT_FAILURE;
     }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ bool ConfigurationFileExists(ArgsManager& argsman)`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`const fs::path rel_config_path = argsman.GetPathArg("-conf", BITCOIN_CONF_FILENAME);`
`112`		`- const fs::path abs_config_path = AbsPathForConfigVal(rel_config_path, true);`
	`112`	`+ const fs::path abs_config_path = AbsPathForConfigVal(argsman, rel_config_path, true);`
`113`	`113`	`if (fs::exists(abs_config_path)) {`
`114`	`114`	`return true;`
`115`	`115`	`}`
`@@ -169,7 +169,7 @@ int QmlGuiMain(int argc, char* argv[])`
`169`	`169`	`app.setApplicationName(QAPP_APP_NAME_DEFAULT);`
`170`	`170`
`171`	`171`	`/// Determine availability of data directory.`
`172`		`- if (!CheckDataDirOption()) {`
	`172`	`+ if (!CheckDataDirOption(gArgs)) {`
`173`	`173`	`InitError(strprintf(Untranslated("Specified data directory \"%s\" does not exist.\n"), gArgs.GetArg("-datadir", "")));`
`174`	`174`	`return EXIT_FAILURE;`
`175`	`175`	`}`