From 5ba7b0650dc31f65be9083d4d8fa75f2a93ba474 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Tue, 19 Oct 2010 09:51:57 +0000 Subject: [PATCH] wxIsoFile: final annoying compilation error fixed. Just needs a little linux-side testing now. git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3945 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/Exceptions.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/src/Utilities/Exceptions.cpp b/common/src/Utilities/Exceptions.cpp index 3249ddc737..893365f039 100644 --- a/common/src/Utilities/Exceptions.cpp +++ b/common/src/Utilities/Exceptions.cpp @@ -169,24 +169,20 @@ Exception::RuntimeError::RuntimeError( const std::runtime_error& ex, const wxStr { IsSilent = false; - const wxString msg( pxsFmt( L"STL Runtime Error%s: %s", + SetDiagMsg( pxsFmt( L"STL Runtime Error%s: %s", (prefix.IsEmpty() ? prefix.c_str() : pxsFmt(L" (%s)", prefix.c_str()).c_str()), fromUTF8( ex.what() ).c_str() ) ); - - SetDiagMsg( msg ); } Exception::RuntimeError::RuntimeError( const std::exception& ex, const wxString& prefix ) { IsSilent = false; - const wxString msg( pxsFmt( L"STL Exception%s: %s", + SetDiagMsg( pxsFmt( L"STL Exception%s: %s", (prefix.IsEmpty() ? prefix.c_str() : pxsFmt(L" (%s)", prefix.c_str()).c_str()), fromUTF8( ex.what() ).c_str() ) ); - - SetDiagMsg( msg ); } // --------------------------------------------------------------------------------------