libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-10 08:04:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove APP_CMD_DEAD

Browse Source
This commit is contained in:
twinaphex 2015-12-09 20:10:22 +01:00
parent decbffd25b
commit 5ac4a8b3f6
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/drivers/platform_linux.c
View File

@ -579,22 +579,16 @@ static void android_app_set_window(void *data, ANativeWindow* window)
slock_unlock(android_app->mutex);
}
static void android_app_set_activity_state(void *data, int8_t cmd)
static void android_app_set_activity_state(struct android_app *android_app, int8_t cmd)
{
struct android_app *android_app = (struct android_app*)data;
if (!android_app)
return;
slock_lock(android_app->mutex);
android_app_write_cmd(android_app, cmd);
while (android_app->activityState != cmd
&& android_app->activityState != APP_CMD_DEAD)
while (android_app->activityState != cmd)
scond_wait(android_app->cond, android_app->mutex);
slock_unlock(android_app->mutex);
if (android_app->activityState == APP_CMD_DEAD)
RARCH_LOG("RetroArch native thread is dead.\n");
}
static void android_app_free(struct android_app* android_app)
@ -2049,15 +2043,13 @@ static void free_saved_state(struct android_app* android_app)
static void android_app_destroy(struct android_app *android_app)
{
JNIEnv *env = NULL;
JNIEnv *env = NULL;
RARCH_LOG("android_app_destroy\n");
free_saved_state(android_app);
slock_lock(android_app->mutex);
android_app->activityState = APP_CMD_DEAD;
env = jni_thread_getenv();
if (env && android_app->onRetroArchExit)

5
frontend/drivers/platform_linux.h
View File

@ -290,10 +290,7 @@ enum
* Command from main thread: the app's activity is being destroyed,
* and waiting for the app thread to clean up and exit before proceeding.
*/
APP_CMD_DESTROY,
// Set by thread when it will no longer reply to commands.
APP_CMD_DEAD
APP_CMD_DESTROY
};
#define JNI_EXCEPTION(env) \