From 1fb47e6393f466ddad5d03a4ec3eb23770141d77 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Fri, 30 Jul 2010 13:14:53 +0000 Subject: [PATCH] Modal windows must be closed with EndModal(), not just Destroy()'ed. wxFD_FILE_MUST_EXIST cannot be used with wxFD_SAVE. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6003 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/AboutDolphin.cpp | 2 +- Source/Core/DolphinWX/Src/FrameTools.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 75956c4130..af608bff03 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -105,7 +105,7 @@ void AboutDolphin::CreateGUIControls() void AboutDolphin::OnClose(wxCloseEvent& WXUNUSED (event)) { - Destroy(); + EndModal(wxID_OK); } void AboutDolphin::CloseClick(wxCommandEvent& WXUNUSED (event)) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 5731aa6637..9c53dd72d5 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -145,6 +145,7 @@ void CFrame::CreateMenu() emulationMenu->AppendSeparator(); emulationMenu->Append(IDM_SCREENSHOT, _T("Take S&creenshot\tF9")); + emulationMenu->AppendSeparator(); wxMenu *saveMenu = new wxMenu; wxMenu *loadMenu = new wxMenu; @@ -626,7 +627,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr ), - wxFD_SAVE | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, + wxFD_SAVE | wxFD_PREVIEW, this); if(path.IsEmpty())