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

pcsx2-gui: Don't put Screenshot button in a submenu. 

Bonus take care of a compiler warning.

Issue #2949
This commit is contained in:
lightningterror 2019-05-01 22:40:49 +02:00
parent 56a976e277
commit bbce809ac9
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/gui/App.h
View File

@ -186,7 +186,6 @@ enum MenuIdentifiers
MenuId_Capture_Video_Record,
MenuId_Capture_Video_Stop,
MenuId_Capture_Screenshot,
MenuId_Capture_Screenshot_Screenshot,
#ifndef DISABLE_RECORDING
// Recording Subsection

1
pcsx2/gui/AppConfig.cpp
View File

@ -1047,7 +1047,6 @@ bool AppConfig::IsOkApplyPreset(int n, bool ignoreMTVU)
// Actual application of current preset over the base settings which all presets use (mostly pcsx2's default values).
Pcsx2Config::CpuOptions& cpuOps(g_Conf->EmuOptions.Cpu);
bool isRateSet = false, isSkipSet = false, isMTVUSet = ignoreMTVU ? true : false; // used to prevent application of specific lower preset values on fallthrough.
switch (n) // Settings will waterfall down to the Safe preset, then stop. So, Balanced and higher will inherit any settings through Safe.
{

5
pcsx2/gui/MainFrame.cpp
View File

@ -247,7 +247,7 @@ void MainEmuFrame::ConnectMenus()
// Capture
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Video_Record_Click, this, MenuId_Capture_Video_Record);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Video_Stop_Click, this, MenuId_Capture_Video_Stop);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Screenshot_Screenshot_Click, this, MenuId_Capture_Screenshot_Screenshot);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Capture_Screenshot_Screenshot_Click, this, MenuId_Capture_Screenshot);
#ifndef DISABLE_RECORDING
// Recording
@ -562,8 +562,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_submenuVideoCapture.Append(MenuId_Capture_Video_Record, _("Start Recording"));
m_submenuVideoCapture.Append(MenuId_Capture_Video_Stop, _("Stop Recording"))->Enable(false);
m_menuCapture.Append(MenuId_Capture_Screenshot, _("Screenshot"), &m_submenuScreenshot);
m_submenuScreenshot.Append(MenuId_Capture_Screenshot_Screenshot, _("Screenshot"));
m_menuCapture.Append(MenuId_Capture_Screenshot, _("Screenshot"));
// ------------------------------------------------------------------------