From 762cdd272d0fb311c7575deca062cde6478ef2fd Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 18 Nov 2006 19:53:39 +0000 Subject: [PATCH] Simplify. --- stepmania/src/arch/Dialog/DialogDriver.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/stepmania/src/arch/Dialog/DialogDriver.cpp b/stepmania/src/arch/Dialog/DialogDriver.cpp index 3dfb72f38f..6e5b99d11c 100644 --- a/stepmania/src/arch/Dialog/DialogDriver.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver.cpp @@ -23,9 +23,6 @@ DialogDriver *MakeDialogDriver() ASSERT( asDriversToTry.size() != 0 ); - RString sDriver; - DialogDriver *pRet = NULL; - FOREACH_CONST( RString, asDriversToTry, Driver ) { map::const_iterator iter = RegisterDialogDriver::g_pRegistrees->find( istring(*Driver) ); @@ -33,20 +30,17 @@ DialogDriver *MakeDialogDriver() if( iter == RegisterDialogDriver::g_pRegistrees->end() ) continue; - pRet = (iter->second)(); + DialogDriver *pRet = (iter->second)(); DEBUG_ASSERT( pRet ); const RString sError = pRet->Init(); - if( sError != "" ) - { - if( LOG ) - LOG->Info( "Couldn't load driver %s: %s", Driver->c_str(), sError.c_str() ); - SAFE_DELETE( pRet ); - continue; - } - break; + if( sError.empty() ) + return pRet; + if( LOG ) + LOG->Info( "Couldn't load driver %s: %s", Driver->c_str(), sError.c_str() ); + SAFE_DELETE( pRet ); } - return pRet; + return NULL; }