From cf64492185bfdb577f415045e600e27b08a7ccbf Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 16 Aug 2019 12:51:09 -0700 Subject: [PATCH] Fix default_tag in win32 launcher not working --- launchers/win32/LauncherManager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/launchers/win32/LauncherManager.cpp b/launchers/win32/LauncherManager.cpp index ea9073763d..991f7bd412 100644 --- a/launchers/win32/LauncherManager.cpp +++ b/launchers/win32/LauncherManager.cpp @@ -476,9 +476,11 @@ void LauncherManager::getMostRecentBuilds(CString& launcherUrlOut, CString& laun LauncherUtils::ResponseError error = LauncherUtils::ResponseError(err); if (error == LauncherUtils::ResponseError::NoError) { Json::Value& json = _latestBuilds; - _defaultBuildTag = json.get("default_tag", "hqlauncher").asCString(); - auto buildTag = _organizationBuildTag.IsEmpty() ? _defaultBuildTag : _organizationBuildTag; if (LauncherUtils::parseJSON(response, json)) { + _defaultBuildTag = json.get("default_tag", "").asCString(); + auto buildTag = _organizationBuildTag.IsEmpty() ? _defaultBuildTag : _organizationBuildTag; + addToLog(_T("Build tag is: ") + buildTag); + if (json["launcher"].isObject()) { if (json["launcher"]["windows"].isObject() && json["launcher"]["windows"]["url"].isString()) { launcherUrlOut = json["launcher"]["windows"]["url"].asCString(); @@ -494,6 +496,7 @@ void LauncherManager::getMostRecentBuilds(CString& launcherUrlOut, CString& laun } if (!findBuildInResponse(json, buildTag, _latestApplicationURL, _latestVersion)) { + addToLog(_T("Failed to find build")); error = LauncherUtils::ResponseError::ParsingJSON; } }