Correctly check for default wallet

achow101 · achow101 · commit cf060628590f · 2020-04-23T13:59:48.000-04:00
diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
@@ -100,5 +100,10 @@ WalletLocation::WalletLocation(const std::string& name)
 
 bool WalletLocation::Exists() const
 {
-    return fs::symlink_status(m_path).type() != fs::file_not_found;
+    fs::path path = m_path;
+    // For the default wallet, check specifically for the wallet.dat file
+    if (m_name.empty()) {
+        path = fs::absolute("wallet.dat", m_path);
+    }
+    return fs::symlink_status(path).type() != fs::file_not_found;
 }

Original file line number	Diff line number	Diff line change
`@@ -100,5 +100,10 @@ WalletLocation::WalletLocation(const std::string& name)`
`100`	`100`
`101`	`101`	`bool WalletLocation::Exists() const`
`102`	`102`	`{`
`103`		`- return fs::symlink_status(m_path).type() != fs::file_not_found;`
	`103`	`+ fs::path path = m_path;`
	`104`	`+ // For the default wallet, check specifically for the wallet.dat file`
	`105`	`+ if (m_name.empty()) {`
	`106`	`+ path = fs::absolute("wallet.dat", m_path);`
	`107`	`+ }`
	`108`	`+ return fs::symlink_status(path).type() != fs::file_not_found;`
`104`	`109`	`}`