summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2024-04-01 18:20:47 +0100
committerAidan MacDonald <amachronic@protonmail.com>2024-04-01 18:21:37 +0100
commit9d585cbc055e91d58bcc2ce16e80021400658362 (patch)
treeb3eb2f7f7aa5b71d9469f694443e4737d1e3b03f
parentf026cc4e176fb80e8d592b95d7a012b7565dd6cc (diff)
downloadrockbox-9d585cbc055e91d58bcc2ce16e80021400658362.tar.gz
rockbox-9d585cbc055e91d58bcc2ce16e80021400658362.zip
Fix red in f026cc4e176f
Change-Id: I9ea1e18a8658a51bf0c917bec372f7509569ede2
-rw-r--r--apps/onplay.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/onplay.c b/apps/onplay.c
index a85284c7d0..0b5dc2fe27 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1390,6 +1390,7 @@ static bool set_catalogdir(void)
1390MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_PLAYLIST_DIR), 1390MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_PLAYLIST_DIR),
1391 set_catalogdir, clipboard_callback, Icon_Playlist); 1391 set_catalogdir, clipboard_callback, Icon_Playlist);
1392 1392
1393#ifdef HAVE_TAGCACHE
1393static bool set_databasedir(void) 1394static bool set_databasedir(void)
1394{ 1395{
1395 path_append(global_settings.tagcache_db_path, selected_file, 1396 path_append(global_settings.tagcache_db_path, selected_file,
@@ -1398,7 +1399,7 @@ static bool set_databasedir(void)
1398 struct tagcache_stat *tc_stat = tagcache_get_stat(); 1399 struct tagcache_stat *tc_stat = tagcache_get_stat();
1399 if (strcasecmp(global_settings.tagcache_db_path, tc_stat->db_path)) 1400 if (strcasecmp(global_settings.tagcache_db_path, tc_stat->db_path))
1400 { 1401 {
1401 splashf(HZ, ID2P(LANG_PLEASE_REBOOT)); 1402 splash(HZ, ID2P(LANG_PLEASE_REBOOT));
1402 } 1403 }
1403 1404
1404 settings_save(); 1405 settings_save();
@@ -1406,11 +1407,14 @@ static bool set_databasedir(void)
1406} 1407}
1407MENUITEM_FUNCTION(set_databasedir_item, 0, ID2P(LANG_DATABASE_DIR), 1408MENUITEM_FUNCTION(set_databasedir_item, 0, ID2P(LANG_DATABASE_DIR),
1408 set_databasedir, clipboard_callback, Icon_Audio); 1409 set_databasedir, clipboard_callback, Icon_Audio);
1410#endif
1409 1411
1410MAKE_ONPLAYMENU(set_as_dir_menu, ID2P(LANG_SET_AS), 1412MAKE_ONPLAYMENU(set_as_dir_menu, ID2P(LANG_SET_AS),
1411 clipboard_callback, Icon_NOICON, 1413 clipboard_callback, Icon_NOICON,
1412 &set_catalogdir_item, 1414 &set_catalogdir_item,
1415#ifdef HAVE_TAGCACHE
1413 &set_databasedir_item, 1416 &set_databasedir_item,
1417#endif
1414#ifdef HAVE_RECORDING 1418#ifdef HAVE_RECORDING
1415 &set_recdir_item, 1419 &set_recdir_item,
1416#endif 1420#endif
@@ -1472,11 +1476,13 @@ static int clipboard_callback(int action,
1472 if (this_item == &delete_dir_item || 1476 if (this_item == &delete_dir_item ||
1473 this_item == &set_startdir_item || 1477 this_item == &set_startdir_item ||
1474 this_item == &set_catalogdir_item || 1478 this_item == &set_catalogdir_item ||
1479#ifdef HAVE_TAGCACHE
1475 this_item == &set_databasedir_item || 1480 this_item == &set_databasedir_item ||
1476 this_item == &set_as_dir_menu 1481#endif
1477#ifdef HAVE_RECORDING 1482#ifdef HAVE_RECORDING
1478 || this_item == &set_recdir_item 1483 this_item == &set_recdir_item ||
1479#endif 1484#endif
1485 this_item == &set_as_dir_menu
1480 ) 1486 )
1481 return action; 1487 return action;
1482 } 1488 }