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

Fix render to main crashing in fullscreen.

Browse Source 
When hiding the menubar (for going fullscreen with render to main),
keep a functionally-duplicate menubar around for servicing menubar
actions.
This commit is contained in:
Shawn Hoffman
2014-09-05 22:15:10 -07:00
parent 387e1e3f21
commit 7308b809d8
3 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinWX/Frame.cpp
View File

@ -318,7 +318,7 @@ CFrame::CFrame(wxFrame* parent,
long style)
: CRenderFrame(parent, id, title, pos, size, style)
, g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr)
, m_SavedPerspectives(nullptr), m_ToolBar(nullptr)
, m_menubar_shadow(nullptr), m_SavedPerspectives(nullptr), m_ToolBar(nullptr)
, m_GameListCtrl(nullptr), m_Panel(nullptr)
, m_RenderFrame(nullptr), m_RenderParent(nullptr)
, m_LogWindow(nullptr), m_LogConfigWindow(nullptr)
@ -353,7 +353,10 @@ CFrame::CFrame(wxFrame* parent,
GetStatusBar()->Hide();
// Give it a menu bar
CreateMenu();
wxMenuBar* menubar_active = CreateMenu();
SetMenuBar(menubar_active);
// Create a menubar to service requests while the real menubar is hidden from the screen
m_menubar_shadow = CreateMenu();
// ---------------
// Main panel
@ -450,6 +453,10 @@ CFrame::~CFrame()
ClosePages();
delete m_Mgr;
// This object is owned by us, not wxw
m_menubar_shadow->Destroy();
m_menubar_shadow = nullptr;
}
bool CFrame::RendererIsFullscreen()
@ -1271,9 +1278,9 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
DoToggleToolbar(SConfig::GetInstance().m_InterfaceToolbar);
// Recreate the menubar if needed.
if (GetMenuBar() == nullptr)
if (wxFrame::GetMenuBar() == nullptr)
{
CreateMenu();
SetMenuBar(CreateMenu());
}
// Show statusbar if enabled