From 4512a3cad02de607f3bb60e5e3334a5f3e606c9f Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Thu, 5 Apr 2012 19:49:49 +0000 Subject: [PATCH] A recently added fix for warnings under Linux is creating an assert on Windows. The problem only affects debug builds but it should get a review. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5141 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/RecentIsoList.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp index eecd7e7184..34a2c284c2 100644 --- a/pcsx2/gui/RecentIsoList.cpp +++ b/pcsx2/gui/RecentIsoList.cpp @@ -122,6 +122,12 @@ void RecentIsoManager::Repopulate() m_Separator = m_Menu->AppendSeparator(); // The following line is important + // Update: It also makes debug WX assert on Windows. Can we review wether this is needed in Linux at all? + // Below is a version that doesn't trigger the assert (WX on Windows complains about an empty string), but + // ideally this line should get removed. + + //wxString temp = L"isupresswarnings"; + //m_Menu->Remove( m_Menu->Append( -1, temp ) ); m_Menu->Remove( m_Menu->Append( -1, wxEmptyString ) ); //Note: the internal recent iso list (m_Items) has the most recent item last (also at the INI file)