From 9532e6b7c999ba4e26225664b04e12a4264fd780 Mon Sep 17 00:00:00 2001 From: miketout Date: Tue, 23 Oct 2018 21:21:59 -0700 Subject: [PATCH] Hoisted path var in ZC_GetBaseParamsDir --- src/util.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util.cpp b/src/util.cpp index 5ce7c4967..753f52ae4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -554,17 +554,17 @@ static boost::filesystem::path ZC_GetBaseParamsDir() // Windows >= Vista: C:\Users\Username\AppData\Roaming\ZcashParams // Mac: ~/Library/Application Support/ZcashParams // Unix: ~/.zcash-params + fs::path pathRet; #ifdef _WIN32 // Windows if (mapArgs.count("-zcashparamsdir")) { - path = fs::system_complete(mapArgs["-zcashparamsdir"]); - if (fs::is_directory(path)) { - return path; + pathRet = fs::system_complete(mapArgs["-zcashparamsdir"]); + if (fs::is_directory(pathRet)) { + return pathRet; } } return GetSpecialFolderPath(CSIDL_APPDATA) / "ZcashParams"; #else - fs::path pathRet; char* pszHome = getenv("HOME"); if (pszHome == NULL || strlen(pszHome) == 0) pathRet = fs::path("/");