From 9a5374e23f63a9ac96b9d0eb63f90bfdfc747368 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 24 Jun 2006 00:58:38 +0000 Subject: [PATCH] Use AbortRetryIgnore, don't just Throw. --- stepmania/src/Sprite.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index abdbd8d726..fe51242bf8 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -156,8 +156,20 @@ retry: "There is more than one file that matches " "'%s'. Please remove all but one of these matches.", sPath.c_str() ); - - RageException::Throw( message ); +#ifdef DEBUG + message += "\n" + join( "\n", asElementPaths ); +#endif + switch( Dialog::AbortRetryIgnore(message) ) + { + case Dialog::abort: + RageException::Throw( message ); + case Dialog::retry: + goto retry; + case Dialog::ignore: + return; + default: + ASSERT(0); + } } sPath = asElementPaths[0];