ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: Remove old recent ISO list workarounds 

Seems to work fine now, no warnings or compile errors.
This commit is contained in:
Jonathan Li 2016-05-19 09:00:36 +01:00
parent e258f3e2fa
commit 9537accb51
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcsx2/gui/RecentIsoList.cpp
View File

@ -76,13 +76,7 @@ void RecentIsoManager::OnChangedSelection( wxCommandEvent& evt )
ScopedCoreThreadPopup stopped_core;
#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();
}
@ -121,15 +115,6 @@ void RecentIsoManager::Repopulate()
m_Separator = m_Menu->AppendSeparator();
// From arcum's comment on r5141
// What was happening is that when all the radio button menu items in a group are deleted,
// wxwidgets deletes the group, but when you start adding radio menu items again,
// it trys to add them to a group that doesn't exist. Since the group doesn't exist,
// it starts a new group, but it also spews a couple warnings about it in Linux.
#ifdef __linux__
// FIXME is it still useful on v3
m_Menu->Remove( m_Menu->Append( -1, "dummy" ) );
#endif
//Note: the internal recent iso list (m_Items) has the most recent item last (also at the INI file)
// but the menu is composed in reverse order such that the most recent item appears at the top.
for( int i=cnt-1; i>=0; --i )