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

GTK: Fix emulation stuck paused after closing the general options dialog when the "pause when inactive" option has been toggled. 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1009 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2011-03-01 16:48:35 +00:00
parent f77d6366ae
commit d77482ea3e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/windowcallbacks.cpp
View File

@ -542,9 +542,7 @@ bool Window::bOnEmuIdle()
bool Window::on_focus_in_event(GdkEventFocus * _pstEvent) bool Window::on_focus_in_event(GdkEventFocus * _pstEvent)
{ {
if (emulating if (emulating && !m_bPaused)
&& ! m_bPaused
&& m_poCoreConfig->oGetKey<bool>("pause_when_inactive"))
{ {
vStartEmu(); vStartEmu();
soundResume(); soundResume();
@ -555,7 +553,7 @@ bool Window::on_focus_in_event(GdkEventFocus * _pstEvent)
bool Window::on_focus_out_event(GdkEventFocus * _pstEvent) bool Window::on_focus_out_event(GdkEventFocus * _pstEvent)
{ {
if (emulating if (emulating
&& ! m_bPaused && !m_bPaused
&& m_poCoreConfig->oGetKey<bool>("pause_when_inactive")) && m_poCoreConfig->oGetKey<bool>("pause_when_inactive"))
{ {
vStopEmu(); vStopEmu();