libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

RARCH_CTL_FORCE_QUIT is the same as RARCH_CTL_QUIT

Browse Source
This commit is contained in:
twinaphex 2016-05-11 04:24:27 +02:00
parent b9df6f52f5
commit 95a6428915
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command.c
View File

@ -2032,19 +2032,19 @@ bool command_event(enum event_command cmd, void *data)
}
break;
case CMD_EVENT_QUIT_RETROARCH:
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
rarch_ctl(RARCH_CTL_QUIT, NULL);
break;
case CMD_EVENT_SHUTDOWN:
#if defined(__linux__) && !defined(ANDROID)
runloop_msg_queue_push("Shutting down...", 1, 180, true);
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
rarch_ctl(RARCH_CTL_QUIT, NULL);
system("shutdown -P now");
#endif
break;
case CMD_EVENT_REBOOT:
#if defined(__linux__) && !defined(ANDROID)
runloop_msg_queue_push("Rebooting...", 1, 180, true);
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
rarch_ctl(RARCH_CTL_QUIT, NULL);
system("shutdown -r now");
#endif
break;

2
frontend/drivers/platform_gx.c
View File

@ -426,7 +426,7 @@ static bool frontend_gx_set_fork(enum frontend_fork fork_mode)
case FRONTEND_FORK_RESTART:
RARCH_LOG("FRONTEND_FORK_RESTART\n");
gx_fork_mode = fork_mode;
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
command_event(CMD_EVENT_QUIT_RETROARCH, NULL);
break;
case FRONTEND_FORK_NONE:
default:

2
frontend/drivers/platform_linux.c
View File

@ -1827,7 +1827,7 @@ static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
fill_pathname_application_path(executable_path, sizeof(executable_path));
strlcpy(settings->path.libretro, executable_path, sizeof(settings->path.libretro));
}
rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
command_event(CMD_EVENT_QUIT_RETROARCH, NULL);
break;
case FRONTEND_FORK_NONE:
default:

3
retroarch.c
View File

@ -1529,9 +1529,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
break;
case RARCH_CTL_FORCE_QUIT:
rarch_ctl(RARCH_CTL_QUIT, NULL);
break;
case RARCH_CTL_VALIDATE_CPU_FEATURES:
{
uint64_t cpu = cpu_features_get();

2
retroarch.h
View File

@ -91,8 +91,6 @@ enum rarch_ctl_state
RARCH_CTL_QUIT,
RARCH_CTL_FORCE_QUIT,
/* Validates CPU features for given processor architecture.
* Make sure we haven't compiled for something we cannot run.
* Ideally, code would get swapped out depending on CPU support,