From 7e52b9550f1f27bb208656cb8ffcc53ad14c6f01 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Sun, 19 Jul 2020 19:13:15 -0700 Subject: [PATCH] Allow running on systems without wx stackwalker (#3519) closes #2796 --- pcsx2/gui/AppAssert.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pcsx2/gui/AppAssert.cpp b/pcsx2/gui/AppAssert.cpp index a282715c4e..4ce151f86f 100644 --- a/pcsx2/gui/AppAssert.cpp +++ b/pcsx2/gui/AppAssert.cpp @@ -19,6 +19,7 @@ #include +#if wxUSE_STACKWALKER class StackDump : public wxStackWalker { protected: @@ -94,6 +95,7 @@ static wxString pxGetStackTrace( const FnChar_t* calledFrom ) dump.Walk( 3 ); return dump.GetStackTrace(); } +#endif #ifdef __WXDEBUG__ @@ -122,7 +124,11 @@ bool AppDoAssert( const DiagnosticOrigin& origin, const wxChar *msg ) static bool disableAsserts = false; if( disableAsserts ) return false; +#if wxUSE_STACKWALKER wxString trace( pxGetStackTrace(origin.function) ); +#else + wxString trace( "Warning: Platform doesn't support wx stackwalker" ); +#endif wxString dbgmsg( origin.ToString( msg ) ); wxMessageOutputDebug().Printf( L"%s", WX_STR(dbgmsg) );