From f11a2ce17ee6e35cc532f3d467982df2a0fe84fd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 19 Jun 2005 08:48:42 +0000 Subject: [PATCH] fix "called SetNewScreen again" case; simplify (only one path now) --- stepmania/src/ScreenManager.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 127ef45f35..432e3c86d9 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -407,21 +407,12 @@ retry: if( pNewScreen == NULL ) pNewScreen = MakeNewScreen(sScreenName); - - if( pOldTopScreen!=NULL && m_ScreenStack.back()!=pOldTopScreen ) + if( m_sDelayedScreen != "" ) { // While constructing this Screen, it's constructor called // SetNewScreen again! That SetNewScreen Command should // override this older one. SAFE_DELETE( pNewScreen ); - return; - } - - if( PREFSMAN->m_bDelayedScreenLoad && m_sDelayedScreen != "" ) - { - /* Same deal: the ctor called SetNewScreen again. Delete the screen - * we just made, but don't delay again. */ - SAFE_DELETE( pNewScreen ); goto retry; }