From b3ff1f01194d4f3f1d8bb9b656d9caa9cd2975a4 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Sat, 29 Jan 2005 16:47:19 +0000
Subject: [PATCH] Fix: Don't boot user back to the login screen if they're
 logged in.

---
 stepmania/Themes/default/Scripts/Branches.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index 76fa001a98..bc976ea85c 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -3,11 +3,17 @@ function SongSelectionScreen()
 	if PlayModeName() == "Oni" then return "ScreenSelectCourseOni" end
 	if PlayModeName() == "Endless" then return "ScreenSelectCourseEndless" end
 	if IsNetConnected() then ReportStyle() end
-	if IsNetSMOnline() then return "ScreenSMOnlineLogin" end
+	if IsNetSMOnline() then return SMOnlineScreen() end
 	if IsNetConnected() then return "ScreenNetSelectMusic" end
 	return "ScreenSelectMusic"
 end
 
+function SMOnlineScreen()
+	if ( not IsSMOnlineLoggedIn(1) ) and IsPlayerEnabled(1) then return "ScreenSMOnlineLogin" end
+	if ( not IsSMOnlineLoggedIn(2) ) and IsPlayerEnabled(2) then return "ScreenSMOnlineLogin" end
+	return "ScreenNetRoom"
+end	
+
 function SelectGameplayScreen()
 	if IsExtraStage() or IsExtraStage2() then return "ScreenGameplay" end
 	return "ScreenGameplay"