Fix warning (gcc was erroneously saying that it was reaching the end of a nonvoid function) and remove goto.
This commit is contained in:
@@ -762,8 +762,8 @@ RString ThemeManager::GetMetricRaw( const RString &sClassName_, const RString &s
|
||||
const RString sClassName = sClassName_;
|
||||
const RString sValueName = sValueName_;
|
||||
|
||||
try_metric_again:
|
||||
|
||||
while( true )
|
||||
{
|
||||
RString ret;
|
||||
if( ThemeManager::GetMetricRawRecursive( sClassName, sValueName, ret ) )
|
||||
return ret;
|
||||
@@ -777,7 +777,7 @@ try_metric_again:
|
||||
case Dialog::retry:
|
||||
FlushDirCache();
|
||||
ReloadMetrics();
|
||||
goto try_metric_again;
|
||||
continue;
|
||||
case Dialog::ignore:
|
||||
return NULL;
|
||||
default:
|
||||
@@ -795,6 +795,7 @@ try_metric_again:
|
||||
);
|
||||
RageException::Throw( sError );
|
||||
}
|
||||
}
|
||||
|
||||
/* Get a string metric. */
|
||||
RString ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName )
|
||||
|
||||
Reference in New Issue
Block a user