actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify.

Browse Source
This commit is contained in:
Steve Checkoway
2006-11-18 19:53:39 +00:00
parent 729185ed8e
commit 762cdd272d
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Dialog/DialogDriver.cpp
+7 -13
View File
@@ -23,9 +23,6 @@ DialogDriver *MakeDialogDriver()
ASSERT( asDriversToTry.size() != 0 ); ASSERT( asDriversToTry.size() != 0 );
RString sDriver;
DialogDriver *pRet = NULL;
FOREACH_CONST( RString, asDriversToTry, Driver ) FOREACH_CONST( RString, asDriversToTry, Driver )
{ {
map<istring, CreateDialogDriverFn>::const_iterator iter = RegisterDialogDriver::g_pRegistrees->find( istring(*Driver) ); map<istring, CreateDialogDriverFn>::const_iterator iter = RegisterDialogDriver::g_pRegistrees->find( istring(*Driver) );
@@ -33,20 +30,17 @@ DialogDriver *MakeDialogDriver()
if( iter == RegisterDialogDriver::g_pRegistrees->end() ) if( iter == RegisterDialogDriver::g_pRegistrees->end() )
continue; continue;
pRet = (iter->second)(); DialogDriver *pRet = (iter->second)();
DEBUG_ASSERT( pRet ); DEBUG_ASSERT( pRet );
const RString sError = pRet->Init(); const RString sError = pRet->Init();
if( sError != "" ) if( sError.empty() )
{ return pRet;
if( LOG ) if( LOG )
LOG->Info( "Couldn't load driver %s: %s", Driver->c_str(), sError.c_str() ); LOG->Info( "Couldn't load driver %s: %s", Driver->c_str(), sError.c_str() );
SAFE_DELETE( pRet ); SAFE_DELETE( pRet );
continue;
}
break;
} }
return pRet; return NULL;
} }