Skip to content

Commit 5d8490f

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

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

menu/main.cpp

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

603603
/* Send command to cancel any previously scheduled powerdown */
604-
fp = popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r");
604+
fp = popen(SHELL_CMD_POWERDOWN_HANDLE, "r");
605605
if (fp == NULL)
606606
{
607607
/* Countdown is still ticking, so better do nothing

menu/menu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -945,8 +945,8 @@ void run_menu_loop()
945945
if(menu_confirmation){
946946
MENU_DEBUG_PRINTF("Powerdown - confirmed\n");
947947
/// ----- Shell cmd ----
948-
execlp(SHELL_CMD_SHUTDOWN_FUNKEY, SHELL_CMD_SHUTDOWN_FUNKEY, NULL);
949-
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_SHUTDOWN_FUNKEY);
948+
execlp(SHELL_CMD_POWERDOWN, SHELL_CMD_POWERDOWN, NULL);
949+
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_POWERDOWN);
950950
exit(0);
951951
}
952952
else{

menu/menu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ typedef enum {RESUME_OPTIONS} ENUM_RESUME_OPTIONS;
180180
#define SHELL_CMD_NOTIF_CLEAR "notif clear"
181181
#define SHELL_CMD_AUDIO_AMP_ON "audio_amp on"
182182
#define SHELL_CMD_AUDIO_AMP_OFF "audio_amp off"
183-
#define SHELL_CMD_CANCEL_SCHED_POWERDOWN "cancel_sched_powerdown"
183+
#define SHELL_CMD_POWERDOWN "powerdown"
184+
#define SHELL_CMD_POWERDOWN_HANDLE "powerdown handle"
184185
#define SHELL_CMD_INSTANT_PLAY "instant_play"
185-
#define SHELL_CMD_SHUTDOWN_FUNKEY "shutdown_funkey"
186186
#define SHELL_CMD_KEYMAP_DEFAULT "keymap default"
187187
#define SHELL_CMD_KEYMAP_RESUME "keymap resume"
188188

0 commit comments

Comments
 (0)