piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TLB games support for the iCache, games using the TLB Hack should now work as before (fixes issue 1218)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4492 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2009-11-01 01:24:30 +00:00
parent 22a0864337
commit 6c0c97cffe
12 changed files with 125 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -659,7 +659,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
// Toggle fullscreen
if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == WXK_RETURN && event.GetModifiers() == wxMOD_ALT))
{
DoFullscreen(!IsFullScreen());
// If a modal dialog is open, this will still process the keyboard events, and may cause
// the main window to become unresponsive, so we have to avoid that.
if ((bRenderToMain || Core::GetState() != Core::CORE_RUN) && !m_bModalDialogOpen)
DoFullscreen(!IsFullScreen());
// We do that to avoid the event to be double processed (which would cause the window to be stuck in fullscreen)
event.StopPropagation();
@ -832,9 +835,7 @@ wxAuiNotebook* CFrame::CreateEmptyNotebook()
void CFrame::DoFullscreen(bool bF)
{
// Only switch this to fullscreen if we're rendering to main OR if we're not running a game
// AND if this is the active window, as it could cause the main window to become unresponsive
// if we're switching to fullscreen while a modal dialog is open
if ((bRenderToMain || Core::GetState() != Core::CORE_RUN) && this->IsActive())
if (bRenderToMain || Core::GetState() != Core::CORE_RUN)
{
ShowFullScreen(bF);

1
Source/Core/DolphinWX/Src/Frame.h
View File

@ -194,6 +194,7 @@ class CFrame : public wxFrame
bool m_bEdit;
bool m_bTabSplit;
bool m_bNoDocking;
bool m_bModalDialogOpen;
char **drives;

10
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -665,9 +665,11 @@ void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event))
{
m_bModalDialogOpen = true;
CConfigMain ConfigMain(this);
if (ConfigMain.ShowModal() == wxID_OK)
m_GameListCtrl->Update();
m_bModalDialogOpen = false;
}
void CFrame::OnPluginGFX(wxCommandEvent& WXUNUSED (event))
@ -712,8 +714,10 @@ void CFrame::OnHelp(wxCommandEvent& event)
{
case IDM_HELPABOUT:
{
AboutDolphin frame(this);
frame.ShowModal();
m_bModalDialogOpen = true;
AboutDolphin frame(this);
frame.ShowModal();
m_bModalDialogOpen = false;
break;
}
case IDM_HELPWEBSITE:
@ -756,8 +760,10 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
{
m_bModalDialogOpen = true;
CMemcardManager MemcardManager(this);
MemcardManager.ShowModal();
m_bModalDialogOpen = false;
}
void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED (event))