ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cheevos: Fix panic when logging in with fullscreen UI disabled

This commit is contained in:
Connor McLaughlin 2021-03-17 00:37:55 +10:00
parent 86e5780c0d
commit 4c76d88728
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/frontend-common/cheevos.cpp
View File

@ -317,11 +317,8 @@ const std::string& GetRichPresenceString()
return s_rich_presence_string; return s_rich_presence_string;
} }
static void LoginASyncCallback(s32 status_code, const FrontendCommon::HTTPDownloader::Request::Data& data) static void LoginCallback(s32 status_code, const FrontendCommon::HTTPDownloader::Request::Data& data)
{ {
if (GetHostInterface()->IsFullscreenUIEnabled())
ImGuiFullscreen::CloseBackgroundProgressDialog("cheevos_async_login");
rapidjson::Document doc; rapidjson::Document doc;
if (!ParseResponseJSON("Login", status_code, data, doc)) if (!ParseResponseJSON("Login", status_code, data, doc))
return; return;
@ -357,13 +354,22 @@ static void LoginASyncCallback(s32 status_code, const FrontendCommon::HTTPDownlo
} }
} }
static void SendLogin(const char* username, const char* password, FrontendCommon::HTTPDownloader* http_downloader) static void LoginASyncCallback(s32 status_code, const FrontendCommon::HTTPDownloader::Request::Data& data)
{
if (GetHostInterface()->IsFullscreenUIEnabled())
ImGuiFullscreen::CloseBackgroundProgressDialog("cheevos_async_login");
LoginCallback(status_code, data);
}
static void SendLogin(const char* username, const char* password, FrontendCommon::HTTPDownloader* http_downloader,
FrontendCommon::HTTPDownloader::Request::Callback callback)
{ {
char url[768] = {}; char url[768] = {};
int res = rc_url_login_with_password(url, sizeof(url), username, password); int res = rc_url_login_with_password(url, sizeof(url), username, password);
Assert(res == 0); Assert(res == 0);
http_downloader->CreateRequest(url, LoginASyncCallback); http_downloader->CreateRequest(url, std::move(callback));
} }
bool LoginAsync(const char* username, const char* password) bool LoginAsync(const char* username, const char* password)
@ -380,17 +386,21 @@ bool LoginAsync(const char* username, const char* password)
1, 0); 1, 0);
} }
SendLogin(username, password, s_http_downloader.get()); SendLogin(username, password, s_http_downloader.get(), LoginASyncCallback);
return true; return true;
} }
bool Login(const char* username, const char* password) bool Login(const char* username, const char* password)
{ {
if (g_active) if (g_active)
{ s_http_downloader->WaitForAllRequests();
if (!LoginAsync(username, password))
if (s_logged_in || std::strlen(username) == 0 || std::strlen(password) == 0)
return false; return false;
if (g_active)
{
SendLogin(username, password, s_http_downloader.get(), LoginCallback);
s_http_downloader->WaitForAllRequests(); s_http_downloader->WaitForAllRequests();
return IsLoggedIn(); return IsLoggedIn();
} }
@ -402,7 +412,7 @@ bool Login(const char* username, const char* password)
return false; return false;
http_downloader->SetUserAgent(GetUserAgent()); http_downloader->SetUserAgent(GetUserAgent());
SendLogin(username, password, http_downloader.get()); SendLogin(username, password, http_downloader.get(), LoginCallback);
http_downloader->WaitForAllRequests(); http_downloader->WaitForAllRequests();
return !GetHostInterface()->GetStringSettingValue("Cheevos", "Token").empty(); return !GetHostInterface()->GetStringSettingValue("Cheevos", "Token").empty();