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 sClassName = sClassName_;
|
||||||
const RString sValueName = sValueName_;
|
const RString sValueName = sValueName_;
|
||||||
|
|
||||||
try_metric_again:
|
while( true )
|
||||||
|
{
|
||||||
RString ret;
|
RString ret;
|
||||||
if( ThemeManager::GetMetricRawRecursive( sClassName, sValueName, ret ) )
|
if( ThemeManager::GetMetricRawRecursive( sClassName, sValueName, ret ) )
|
||||||
return ret;
|
return ret;
|
||||||
@@ -777,7 +777,7 @@ try_metric_again:
|
|||||||
case Dialog::retry:
|
case Dialog::retry:
|
||||||
FlushDirCache();
|
FlushDirCache();
|
||||||
ReloadMetrics();
|
ReloadMetrics();
|
||||||
goto try_metric_again;
|
continue;
|
||||||
case Dialog::ignore:
|
case Dialog::ignore:
|
||||||
return NULL;
|
return NULL;
|
||||||
default:
|
default:
|
||||||
@@ -794,6 +794,7 @@ try_metric_again:
|
|||||||
sDefaultMetricPath.c_str()
|
sDefaultMetricPath.c_str()
|
||||||
);
|
);
|
||||||
RageException::Throw( sError );
|
RageException::Throw( sError );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get a string metric. */
|
/* Get a string metric. */
|
||||||
|
|||||||
Reference in New Issue
Block a user