Skip to content

Commit cbcdbd8

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

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/drivers/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ void quick_save_and_poweroff()
12871287
printf("Save Instant Play file\n");
12881288

12891289
/* Send command to cancel any previously scheduled powerdown */
1290-
fp = popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r");
1290+
fp = popen(SHELL_CMD_POWERDOWN_HANDLE, "r");
12911291
if (fp == NULL)
12921292
{
12931293
/* Countdown is still ticking, so better do nothing

src/drivers/menu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -990,8 +990,8 @@ void run_menu_loop()
990990
if(menu_confirmation){
991991
MENU_DEBUG_PRINTF("Powerdown - confirmed\n");
992992
/// ----- Shell cmd ----
993-
execlp(SHELL_CMD_SHUTDOWN_FUNKEY, SHELL_CMD_SHUTDOWN_FUNKEY, NULL);
994-
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_SHUTDOWN_FUNKEY);
993+
execlp(SHELL_CMD_POWERDOWN, SHELL_CMD_POWERDOWN, NULL);
994+
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_POWERDOWN);
995995
exit(0);
996996
}
997997
else{

src/drivers/menu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ typedef enum {RESUME_OPTIONS} ENUM_RESUME_OPTIONS;
4949
#define SHELL_CMD_NOTIF_SET "notif set"
5050
#define SHELL_CMD_AUDIO_AMP_ON "audio_amp on"
5151
#define SHELL_CMD_AUDIO_AMP_OFF "audio_amp off"
52-
#define SHELL_CMD_CANCEL_SCHED_POWERDOWN "cancel_sched_powerdown"
52+
#define SHELL_CMD_POWERDOWN "powerdown"
53+
#define SHELL_CMD_POWERDOWN_HANDLE "powerdown handle"
5354
#define SHELL_CMD_INSTANT_PLAY "instant_play"
54-
#define SHELL_CMD_SHUTDOWN_FUNKEY "shutdown_funkey"
5555
#define SHELL_CMD_KEYMAP_DEFAULT "keymap default"
5656
#define SHELL_CMD_KEYMAP_RESUME "keymap resume"
5757

0 commit comments

Comments
 (0)