summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2021-07-24 18:28:28 +0100
committerAidan MacDonald <amachronic@protonmail.com>2021-08-04 19:04:37 +0000
commitbdd9c8dfc8abc7b066334820bd93e4394571a46b (patch)
tree17e6de03aa493074b2dd25e2273b83e0d08199ce
parent005c414e5f2a0ace3756da767d3920ac98cb5c76 (diff)
downloadrockbox-bdd9c8dfc8abc7b066334820bd93e4394571a46b.tar.gz
rockbox-bdd9c8dfc8abc7b066334820bd93e4394571a46b.zip
plugins: Fix issues in 2048
One of these was an unintentional fallthrough -- if you said no to 'quit without saving' it would save and quit. Change-Id: I33828b58962a05adab65ac5f71dd0e2b1e07001b
-rw-r--r--apps/plugins/2048.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/plugins/2048.c b/apps/plugins/2048.c
index 1604b73c62..2633753071 100644
--- a/apps/plugins/2048.c
+++ b/apps/plugins/2048.c
@@ -811,8 +811,7 @@ static int do_2048_pause_menu(void)
811 "Help", 811 "Help",
812 "Quit without Saving", 812 "Quit without Saving",
813 "Quit"); 813 "Quit");
814 bool quit = false; 814 while(1)
815 while(!quit)
816 { 815 {
817 switch(rb->do_menu(&menu, &sel, NULL, false)) 816 switch(rb->do_menu(&menu, &sel, NULL, false))
818 { 817 {
@@ -849,9 +848,10 @@ static int do_2048_pause_menu(void)
849 } 848 }
850 case 6: 849 case 6:
851 return 3; 850 return 3;
851 default:
852 break;
852 } 853 }
853 } 854 }
854 return 0;
855} 855}
856 856
857static void exit_handler(void) 857static void exit_handler(void)
@@ -1017,8 +1017,7 @@ static enum plugin_status do_2048_menu(void)
1017 "Help", 1017 "Help",
1018 "Quit without Saving", 1018 "Quit without Saving",
1019 "Quit"); 1019 "Quit");
1020 bool quit = false; 1020 while(true)
1021 while(!quit)
1022 { 1021 {
1023 switch(rb->do_menu(&menu, &sel, NULL, false)) 1022 switch(rb->do_menu(&menu, &sel, NULL, false))
1024 { 1023 {
@@ -1065,6 +1064,7 @@ static enum plugin_status do_2048_menu(void)
1065 case 5: 1064 case 5:
1066 if(confirm_quit()) 1065 if(confirm_quit())
1067 return PLUGIN_OK; 1066 return PLUGIN_OK;
1067 break;
1068 case 6: 1068 case 6:
1069 if(loaded) 1069 if(loaded)
1070 save_game(); 1070 save_game();
@@ -1073,7 +1073,6 @@ static enum plugin_status do_2048_menu(void)
1073 break; 1073 break;
1074 } 1074 }
1075 } 1075 }
1076 return PLUGIN_OK;
1077} 1076}
1078 1077
1079/* plugin entry point */ 1078/* plugin entry point */