diff options
| author | Autechre | 2020-06-08 03:54:19 +0200 |
|---|---|---|
| committer | GitHub | 2020-06-08 03:54:19 +0200 |
| commit | c94e67e135650c1cdcb9423cfabf176bc014b340 (patch) | |
| tree | 583ff29a40f4594b9579a3ac3c346adf469e652c | |
| parent | ba5205015c1db5866b6979537c594d8e81f90500 (diff) | |
| parent | ea17432f22e441c9bf6f1c60f58a8cc6faaebbb1 (diff) | |
| download | pcsx_rearmed-c94e67e135650c1cdcb9423cfabf176bc014b340.tar.gz pcsx_rearmed-c94e67e135650c1cdcb9423cfabf176bc014b340.tar.bz2 pcsx_rearmed-c94e67e135650c1cdcb9423cfabf176bc014b340.zip | |
Merge pull request #429 from ZachCook/master
lightrec: fix race that could cause a freeze during load/reset
| -rw-r--r-- | deps/lightrec/.gitrepo | 2 | ||||
| -rw-r--r-- | deps/lightrec/recompiler.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deps/lightrec/.gitrepo b/deps/lightrec/.gitrepo index 0dbefe8..4ebb7d2 100644 --- a/deps/lightrec/.gitrepo +++ b/deps/lightrec/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/pcercuei/lightrec.git branch = master - commit = 2081869a00371dac285836fb950f8cd0c26b55b9 + commit = 2cca097e538876d219b8af9663abe0ca74f68bb2 parent = 5c00ea32a0eab812299b08acd14c25bf6ba4ca7a method = merge cmdver = 0.4.1 diff --git a/deps/lightrec/recompiler.c b/deps/lightrec/recompiler.c index e60889c..634d3d0 100644 --- a/deps/lightrec/recompiler.c +++ b/deps/lightrec/recompiler.c @@ -76,7 +76,7 @@ static void * lightrec_recompiler_thd(void *d) pthread_mutex_lock(&rec->mutex); - do { + while (!rec->stop) { do { pthread_cond_wait(&rec->cond, &rec->mutex); @@ -86,7 +86,7 @@ static void * lightrec_recompiler_thd(void *d) } while (slist_empty(&rec->slist)); lightrec_compile_list(rec); - } while (!rec->stop); + } out_unlock: pthread_mutex_unlock(&rec->mutex); |