fix login failure messages

definitely for rebirth not sure about til death
etternagame · Oct 23, 2021 · 942869f · 942869f
1 parent e779370
commit 942869f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Themes/Rebirth/BGAnimations/playerInfoFrame/main.lua b/Themes/Rebirth/BGAnimations/playerInfoFrame/main.lua
@@ -6,9 +6,11 @@ local t = Def.ActorFrame {
     end,
     LogOutMessageCommand = function(self)
         self:playcommand("Set")
+        ms.ok("Logged out")
     end,
     LoginFailedMessageCommand = function(self)
         self:playcommand("Set")
+        ms.ok("Login Failed")
     end,
     OnlineUpdateMessageCommand = function(self)
         self:playcommand("Set")

diff --git a/src/Etterna/Singletons/DownloadManager.cpp b/src/Etterna/Singletons/DownloadManager.cpp
@@ -2218,6 +2218,7 @@ DownloadManager::StartSession(
 			DLMAN->authToken = DLMAN->sessionUser = DLMAN->sessionPass = "";
 			MESSAGEMAN->Broadcast("LoginFailed");
 			DLMAN->loggingIn = false;
+			return;
 		}
 
 		if (d.HasMember("data") && d["data"].IsObject() &&
@@ -2231,6 +2232,9 @@ DownloadManager::StartSession(
 			DLMAN->sessionPass = pass;
 		} else {
 			DLMAN->authToken = DLMAN->sessionUser = DLMAN->sessionPass = "";
+			MESSAGEMAN->Broadcast("LoginFailed");
+			DLMAN->loggingIn = false;
+			return;
 		}
 		DLMAN->OnLogin();
 		callback(DLMAN->LoggedIn());