mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Several little things:
Clean up of the input selected for the opengl x window in linux. Fix a potential segfault when taking a screenshot (happens consistently when using "Save Targets" from the video debugger window). Fix a memory corruption error that results from the wrong image size being passed when dumping textures. Make the screenshot hotkey configurable. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6067 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -744,6 +744,9 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
// Stop
|
||||
else if (IsHotkey(event, HK_STOP))
|
||||
DoStop();
|
||||
// Screenshot hotkey
|
||||
else if (IsHotkey(event, HK_SCREENSHOT))
|
||||
Core::ScreenShot();
|
||||
// Wiimote connect and disconnect hotkeys
|
||||
else if (IsHotkey(event, HK_WIIMOTE1_CONNECT))
|
||||
WiimoteId = 0;
|
||||
@ -753,7 +756,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
WiimoteId = 2;
|
||||
else if (IsHotkey(event, HK_WIIMOTE4_CONNECT))
|
||||
WiimoteId = 3;
|
||||
// state save and state load hotkeys
|
||||
// State save and state load hotkeys
|
||||
else if (event.GetKeyCode() >= WXK_F1 && event.GetKeyCode() <= WXK_F8)
|
||||
{
|
||||
int slot_number = event.GetKeyCode() - WXK_F1 + 1;
|
||||
@ -775,9 +778,6 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
else
|
||||
event.Skip();
|
||||
}
|
||||
// screenshot hotkeys
|
||||
else if (event.GetKeyCode() == WXK_F9 && event.GetModifiers() == wxMOD_NONE)
|
||||
Core::ScreenShot();
|
||||
else
|
||||
event.Skip();
|
||||
|
||||
|
Reference in New Issue
Block a user