Can't ignore missing files in Other

This commit is contained in:
Glenn Maynard
2003-12-28 22:27:27 +00:00
parent 4ff430076c
commit 10c8d51d94
+9 -1
View File
@@ -347,8 +347,14 @@ try_element_again:
CString sCategory = ELEMENT_CATEGORY_STRING[category]; CString sCategory = ELEMENT_CATEGORY_STRING[category];
/* We can't fall back on _missing in Other: the file types are unknown. */
CString sMessage = "The theme element '" + sCategory + "/" + sFileName +"' is missing."; CString sMessage = "The theme element '" + sCategory + "/" + sFileName +"' is missing.";
switch( HOOKS->MessageBoxAbortRetryIgnore(sMessage, "MissingThemeElement") ) ArchHooks::MessageBoxResult res;
if( category != Other )
res = HOOKS->MessageBoxAbortRetryIgnore(sMessage, "MissingThemeElement");
else
res = HOOKS->MessageBoxRetryCancel(sMessage, "MissingThemeElement");
switch( res )
{ {
case ArchHooks::retry: case ArchHooks::retry:
FlushDirCache(); FlushDirCache();
@@ -368,7 +374,9 @@ try_element_again:
Cache[sFileName] = GetPathTo( category, "_missing" ); Cache[sFileName] = GetPathTo( category, "_missing" );
return Cache[sFileName]; return Cache[sFileName];
/* XXX: "abort" and "cancel" are synonyms; merge */
case ArchHooks::abort: case ArchHooks::abort:
case ArchHooks::cancel:
RageException::Throw( "Theme element '%s/%s' could not be found in '%s' or '%s'.", RageException::Throw( "Theme element '%s/%s' could not be found in '%s' or '%s'.",
sCategory.c_str(), sCategory.c_str(),
sFileName.c_str(), sFileName.c_str(),