Skip to content

Commit 1996226

Browse files
committed
hopefully fix all exit cases
Signed-off-by: Michel-FK <[email protected]>
1 parent 6f39b34 commit 1996226

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

fk_menu.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,7 @@ void FK_InitMenu(void)
435435
#endif
436436
#ifdef HAS_MENU_RO_RW
437437
/// ----- Shell cmd ----
438-
FILE *fp = popen(SHELL_CMD_RO, "r");
439-
if (fp == NULL) {
438+
if (system(SHELL_CMD_RO) < 0) {
440439
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_RO);
441440
}
442441
#endif
@@ -474,9 +473,8 @@ void FK_EndMenu(void)
474473

475474
#ifdef HAS_MENU_RO_RW
476475
/// ----- Shell cmd ----
477-
FILE *fp = popen(SHELL_CMD_RO, "r");
478-
if (fp == NULL) {
479-
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_RO);
476+
if (system(SHELL_CMD_RO) < 0) {
477+
MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_RO);
480478
}
481479
#endif
482480

@@ -1316,8 +1314,7 @@ int FK_RunMenu(SDL_Surface *screen)
13161314
menu_screen_refresh(screen, menuItem, prevItem, scroll, menu_confirmation, 1);
13171315

13181316
/// ----- Shell cmd ----
1319-
fp = popen(read_write?SHELL_CMD_RO:SHELL_CMD_RW, "r");
1320-
if (fp == NULL) {
1317+
if (system(read_write?SHELL_CMD_RO:SHELL_CMD_RW) < 0) {
13211318
MENU_ERROR_PRINTF("Failed to run command %s\n", shell_cmd);
13221319
}
13231320
else{

0 commit comments

Comments
 (0)