From 546ead475bbe89e2bdbbd2619026b963cc6d119c Mon Sep 17 00:00:00 2001 From: arcum42 Date: Wed, 5 May 2010 09:10:22 +0000 Subject: [PATCH] Tweak zzogl-pg's C::B file a bit. Slap a quick patch on pcsx2 so it compiles. (Jake will probably want to fix that properly...) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2949 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/RecentIsoList.cpp | 6 ++++++ plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp index 6d4ed4a77d..64ddf54fda 100644 --- a/pcsx2/gui/RecentIsoList.cpp +++ b/pcsx2/gui/RecentIsoList.cpp @@ -62,7 +62,13 @@ void RecentIsoManager::OnChangedSelection( wxCommandEvent& evt ) ScopedCoreThreadPopup stopped_core; //SysUpdateIsoSrcFile( m_Items[i].Filename ); +#ifdef __LINUX__ + // Likely not what was intended, but it compiles for the moment... + SwapOrReset_Iso( NULL, stopped_core, m_Items[i].Filename, GetMsg_IsoImageChanged()); +#else + // Getting a window from the menu? SwapOrReset_Iso( m_Menu->GetWindow(), stopped_core, m_Items[i].Filename, GetMsg_IsoImageChanged()); +#endif stopped_core.AllowResume(); } diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp index 3d3a3dea27..7a412bf2ce 100644 --- a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp +++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp @@ -30,6 +30,7 @@