mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-12 09:10:11 +01:00
* Fixed death-by-recursion caused when a thread threw an exception.
* Fixed some minor bugs when processing idle events. * Plugin Load/Init/Shutdown/Unload are all called from the Main/UI thread again; this is important for plugins that issue popup warning/error messages. DevNotes: * Added ScopedPtrMT, a multithread-safe version of ScopedPtr. * MTGS errors are still not handled as gracefully as they should be; namely the MTGS thread doesn't restart itself (it's on the TODO list). git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2958 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
1 parent
0918cb42a3
commit
12bdd9dc10
16 files changed
+467
-124
No files matched your search
@@ -174,8 +174,19 @@ wxString BaseException::FormatDiagnosticMessage() const
|
||||
// ------------------------------------------------------------------------
|
||||
Exception::RuntimeError::RuntimeError( const std::runtime_error& ex, const wxString& prefix )
|
||||
{
|
||||
const wxString msg( wxsFormat( L"%sSTL Runtime Error: %s",
|
||||
(prefix.IsEmpty() ? prefix.c_str() : wxsFormat(L"(%s) ", prefix.c_str()).c_str()),
|
||||
const wxString msg( wxsFormat( L"STL Runtime Error%s: %s",
|
||||
(prefix.IsEmpty() ? prefix.c_str() : wxsFormat(L" (%s)", prefix.c_str()).c_str()),
|
||||
fromUTF8( ex.what() ).c_str()
|
||||
) );
|
||||
|
||||
BaseException::InitBaseEx( msg, msg );
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
Exception::RuntimeError::RuntimeError( const std::exception& ex, const wxString& prefix )
|
||||
{
|
||||
const wxString msg( wxsFormat( L"STL Exception%s: %s",
|
||||
(prefix.IsEmpty() ? prefix.c_str() : wxsFormat(L" (%s)", prefix.c_str()).c_str()),
|
||||
fromUTF8( ex.what() ).c_str()
|
||||
) );
|
||||
|
||||
|
||||
Reference in new issue
Block a user