aboutsummaryrefslogtreecommitdiff
path: root/frontend/main.c
diff options
context:
space:
mode:
authornotaz2013-01-05 00:06:41 +0200
committernotaz2013-01-05 19:21:12 +0200
commit81edd2b39a4efb991c4eaab15db4dd20ae3eafda (patch)
tree584e9427fbecb0bde0a6af59c54908e58fa089d8 /frontend/main.c
parent0fed3dc3d9799a9db68dd8be4172aafb0e161957 (diff)
downloadpcsx_rearmed-81edd2b39a4efb991c4eaab15db4dd20ae3eafda.tar.gz
pcsx_rearmed-81edd2b39a4efb991c4eaab15db4dd20ae3eafda.tar.bz2
pcsx_rearmed-81edd2b39a4efb991c4eaab15db4dd20ae3eafda.zip
frontend: don't update during reset
otherwise update thread may collect input events that really belong to UI. Another hack :(
Diffstat (limited to 'frontend/main.c')
-rw-r--r--frontend/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/frontend/main.c b/frontend/main.c
index bd48898..43a1a03 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -48,7 +48,7 @@ extern int iUseInterpolation;
extern int iXAPitch;
extern int iVolume;
-int ready_to_go;
+int ready_to_go, g_resetting;
unsigned long gpuDisp;
char cfgfile_basename[MAXPATHLEN];
int state_slot;
@@ -676,6 +676,7 @@ void SysReset() {
// so we need to prevent updateLace() call..
void *real_lace = GPU_updateLace;
GPU_updateLace = dummy_lace;
+ g_resetting = 1;
// reset can run code, timing must be set
pl_timing_prepare(Config.PsxType);
@@ -686,6 +687,7 @@ void SysReset() {
CDR_stop();
GPU_updateLace = real_lace;
+ g_resetting = 0;
}
void SysClose() {