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

Bring the main gui on top when suspending emulation. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2355 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2009-12-18 16:33:09 +00:00
parent 7af22987b0
commit 89b2ecb4fa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Gif.cpp
View File

@ -243,7 +243,7 @@ void GIFdma()
CPU_INT(2, gscycles * BIAS); CPU_INT(2, gscycles * BIAS);
return; return;
} }
else DevCon.WriteLn("GIFdma() case 1, but qwc = 0!"); //Don't do 0 GIFchain and then return //else DevCon.WriteLn("GIFdma() case 1, but qwc = 0!"); //Don't do 0 GIFchain and then return
} }
// Transfer Dn_QWC from Dn_MADR to GIF // Transfer Dn_QWC from Dn_MADR to GIF
@ -261,7 +261,7 @@ void GIFdma()
CPU_INT(2, gscycles * BIAS); CPU_INT(2, gscycles * BIAS);
return; return;
} }
else DevCon.WriteLn("GIFdma() case 2, but qwc = 0!"); //Don't do 0 GIFchain and then return, fixes Dual Hearts //else DevCon.WriteLn("GIFdma() case 2, but qwc = 0!"); //Don't do 0 GIFchain and then return, fixes Dual Hearts
} }
if ((gif->chcr.MOD == CHAIN_MODE) && (!gspath3done)) // Chain Mode if ((gif->chcr.MOD == CHAIN_MODE) && (!gspath3done)) // Chain Mode

1
pcsx2/gui/GlobalCommands.cpp
View File

@ -139,6 +139,7 @@ namespace Implementations
void Sys_Suspend() void Sys_Suspend()
{ {
CoreThread.Suspend(); CoreThread.Suspend();
sMainFrame.SetFocus();
} }
void Sys_Resume() void Sys_Resume()