summaryrefslogtreecommitdiff
path: root/apps/enc_config.c
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2018-10-15 23:04:04 -0400
committerWilliam Wilgus <me.theuser@yahoo.com>2018-10-18 00:06:31 +0200
commitdd40c46d50f9f22643b828e80783d3576b9c1d50 (patch)
treeb9700f7cbe53bb10e89d91b0c3cf1fea686eb813 /apps/enc_config.c
parente6b23a8f049a89f9f6254a7fa186d33dc65b0ba3 (diff)
downloadrockbox-dd40c46d50f9f22643b828e80783d3576b9c1d50.tar.gz
rockbox-dd40c46d50f9f22643b828e80783d3576b9c1d50.zip
Fix menu warnings
change offending bool return to int warning: cast between incompatible function types from '_Bool (*)(void)' to 'int (*)(void)' [-Wcast-function-type] forgot to remove -- typedef int (*menu_function)(void); Change-Id: Ie4c8d3ddb0fb7843c4ec584203350d658d6bee3e
Diffstat (limited to 'apps/enc_config.c')
-rw-r--r--apps/enc_config.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/enc_config.c b/apps/enc_config.c
index 07405cdac1..7741c293f0 100644
--- a/apps/enc_config.c
+++ b/apps/enc_config.c
@@ -440,7 +440,7 @@ void enc_global_settings_apply(void)
440 440
441/* Show an encoder's config menu based on the global_settings. 441/* Show an encoder's config menu based on the global_settings.
442 Modified settings are placed in global_settings.enc_config. */ 442 Modified settings are placed in global_settings.enc_config. */
443bool enc_global_config_menu(void) 443int enc_global_config_menu(void)
444{ 444{
445 struct encoder_config cfg; 445 struct encoder_config cfg;
446 446
@@ -453,12 +453,12 @@ bool enc_global_config_menu(void)
453 { 453 {
454 menu_callback_data.cfg = &cfg; 454 menu_callback_data.cfg = &cfg;
455 menu_callback_data.global = true; 455 menu_callback_data.global = true;
456 return do_menu(enc_data[cfg.rec_format].menu, NULL, NULL, false) 456 int retmenu = do_menu(enc_data[cfg.rec_format].menu, NULL, NULL, false);
457 == MENU_ATTACHED_USB; 457 return (retmenu == MENU_ATTACHED_USB) ? 1 : 0;
458 } 458 }
459 else 459 else
460 { 460 {
461 splash(HZ, ID2P(LANG_NO_SETTINGS)); 461 splash(HZ, ID2P(LANG_NO_SETTINGS));
462 return false; 462 return 0;
463 } 463 }
464} /* enc_global_config_menu */ 464} /* enc_global_config_menu */