Skip to content
Permalink
Browse files

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

Bonus take care of a compiler warning.

Issue #2949
  • Loading branch information...
lightningterror committed May 1, 2019
1 parent 56a976e commit bbce809ac916cf52000c1396605b653a9fda979f
Showing with 2 additions and 5 deletions.
  1. +0 −1 pcsx2/gui/App.h
  2. +0 −1 pcsx2/gui/AppConfig.cpp
  3. +2 −3 pcsx2/gui/MainFrame.cpp
@@ -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
@@ -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.
{
@@ -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"));

// ------------------------------------------------------------------------

0 comments on commit bbce809

Please sign in to comment.
You can’t perform that action at this time.