From dd992f69c097beede68b2693f4872e3d09aa9ca4 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 6 Feb 2006 22:38:30 +0000
Subject: [PATCH] fix D3D init

---
 stepmania/src/StepMania.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index fa46d95749..8195f27be8 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -703,7 +703,7 @@ RageDisplay *CreateDisplay()
 		else if( sRenderer.CompareNoCase("d3d")==0 )
 		{
 #if defined(SUPPORT_D3D)
-			RageDisplay_D3D *pRet = new RageDisplay_D3D;
+			pRet = new RageDisplay_D3D;
 #endif
 		}
 		else if( sRenderer.CompareNoCase("null")==0 )
@@ -719,16 +719,15 @@ RageDisplay *CreateDisplay()
 			continue;
 
 		RString sError = pRet->Init( params, PREFSMAN->m_bAllowUnacceleratedRenderer );
-		if( sError.empty() )
-		{
-			break;	// we have a display, don't try any more
-		}
-		else
+		if( !sError.empty() )
 		{
 			error += ssprintf(ERROR_INITIALIZING.GetValue(),sRenderer)+"\n" + sError;
 			SAFE_DELETE( pRet );
 			error += "\n\n\n";
+			continue;
 		}
+
+		break;	// the display is ready to go
 	}
 
 	if( pRet == NULL)