Skip to content

Commit 9184665

Browse files
committed
use single powerdown script
Signed-off-by: Vincent-FK <[email protected]>
1 parent b319dba commit 9184665

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

RetroFE/Source/Menu/MenuMode.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ typedef enum {ASPECT_RATIOS} ENUM_ASPECT_RATIOS_TYPES;
5252
#define SHELL_CMD_USB_MOUNT "share start"
5353
#define SHELL_CMD_USB_UNMOUNT "share stop"
5454
#define SHELL_CMD_USB_CHECK_IS_SHARING "share is_sharing"
55-
#define SHELL_CMD_POWERDOWN "shutdown_funkey"
56-
#define SHELL_CMD_SCHEDULE_POWERDOWN "sched_shutdown"
57-
#define SHELL_CMD_CANCEL_SCHED_POWERDOWN "cancel_sched_powerdown"
55+
#define SHELL_CMD_POWERDOWN "powerdown"
56+
#define SHELL_CMD_POWERDOWN_HANDLE "powerdown handle"
5857
#define SHELL_CMD_FRONTEND_SET_GMENU2X "frontend set gmenu2x"
5958
#define SHELL_CMD_FRONTEND_SET_RETROFE "frontend set retrofe"
6059

RetroFE/Source/RetroFE.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,14 +1557,14 @@ void RetroFE::handle_sigusr1(int sig)
15571557
void RetroFE::quick_poweroff()
15581558
{
15591559
/* Send command to cancel any previously scheduled powerdown */
1560-
if (popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r") == NULL)
1560+
if (popen(SHELL_CMD_POWERDOWN_HANDLE, "r") == NULL)
15611561
{
15621562
/* Countdown is still ticking, so better do nothing
15631563
than start writing and get interrupted!
15641564
*/
15651565
printf("Failed to cancel scheduled shutdown\n");
15661566
std::stringstream ss;
1567-
ss << "Failed to run command " << SHELL_CMD_CANCEL_SCHED_POWERDOWN;
1567+
ss << "Failed to run command " << SHELL_CMD_POWERDOWN_HANDLE;
15681568
Logger::write( Logger::ZONE_ERROR, "RetroFE", ss.str() );
15691569
exit(0);
15701570
}

0 commit comments

Comments
 (0)