diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 3766f7e5db..5239bd7ac3 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -114,6 +114,9 @@ static bool dbg_list(char *title, int count, int selection_size, | |||
114 | if (dbg_getname != dbg_menu_getname) | 114 | if (dbg_getname != dbg_menu_getname) |
115 | gui_synclist_hide_selection_marker(&lists, true); | 115 | gui_synclist_hide_selection_marker(&lists, true); |
116 | action_signalscreenchange(); | 116 | action_signalscreenchange(); |
117 | |||
118 | if (action_callback) | ||
119 | action_callback(ACTION_REDRAW, &lists); | ||
117 | gui_synclist_draw(&lists); | 120 | gui_synclist_draw(&lists); |
118 | while(1) | 121 | while(1) |
119 | { | 122 | { |
@@ -125,6 +128,8 @@ static bool dbg_list(char *title, int count, int selection_size, | |||
125 | action = action_callback(action, &lists); | 128 | action = action_callback(action, &lists); |
126 | if (action == ACTION_STD_CANCEL) | 129 | if (action == ACTION_STD_CANCEL) |
127 | break; | 130 | break; |
131 | else if (action == ACTION_REDRAW) | ||
132 | gui_synclist_draw(&lists); | ||
128 | else if(default_event_handler(action) == SYS_USB_CONNECTED) | 133 | else if(default_event_handler(action) == SYS_USB_CONNECTED) |
129 | return true; | 134 | return true; |
130 | } | 135 | } |
@@ -1687,22 +1692,18 @@ static int cardinfo_callback(int btn, struct gui_synclist *lists) | |||
1687 | snprintf(debug_list_messages[cardinfo_lines++], DEBUG_MSG_LEN, | 1692 | snprintf(debug_list_messages[cardinfo_lines++], DEBUG_MSG_LEN, |
1688 | "Not Found!"); | 1693 | "Not Found!"); |
1689 | } | 1694 | } |
1690 | if (lists) | 1695 | snprintf(listtitle, sizeof listtitle, |
1691 | { | 1696 | "[" CARDTYPE " %d]", current_card); |
1692 | snprintf(listtitle, sizeof listtitle, | 1697 | gui_synclist_set_title(lists, listtitle, NOICON); |
1693 | "[" CARDTYPE " %d]", current_card); | 1698 | gui_synclist_select_item(lists, 0); |
1694 | gui_synclist_set_title(lists, listtitle, NOICON); | 1699 | gui_synclist_set_nb_items(lists, cardinfo_lines); |
1695 | gui_synclist_select_item(lists, 0); | 1700 | btn = ACTION_REDRAW; |
1696 | gui_synclist_set_nb_items(lists, cardinfo_lines); | ||
1697 | gui_synclist_draw(lists); | ||
1698 | } | ||
1699 | } | 1701 | } |
1700 | return btn; | 1702 | return btn; |
1701 | } | 1703 | } |
1702 | static bool dbg_disk_info(void) | 1704 | static bool dbg_disk_info(void) |
1703 | { | 1705 | { |
1704 | current_card = 1; /* the callback changes this to 0 */ | 1706 | current_card = 1; /* the callback changes this to 0 */ |
1705 | cardinfo_callback(ACTION_STD_OK, 0); | ||
1706 | dbg_list("[" CARDTYPE " 0]", cardinfo_lines, 1, | 1707 | dbg_list("[" CARDTYPE " 0]", cardinfo_lines, 1, |
1707 | cardinfo_callback, dbg_listmessage_getname); | 1708 | cardinfo_callback, dbg_listmessage_getname); |
1708 | return false; | 1709 | return false; |
@@ -1791,7 +1792,6 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1791 | } | 1792 | } |
1792 | static bool dbg_disk_info(void) | 1793 | static bool dbg_disk_info(void) |
1793 | { | 1794 | { |
1794 | disk_callback(0,0); | ||
1795 | dbg_list("Disk Info",disklines, 1, disk_callback, dbg_listmessage_getname); | 1795 | dbg_list("Disk Info",disklines, 1, disk_callback, dbg_listmessage_getname); |
1796 | return false; | 1796 | return false; |
1797 | } | 1797 | } |
@@ -1821,7 +1821,6 @@ static int dircache_callback(int btn, struct gui_synclist *lists) | |||
1821 | 1821 | ||
1822 | static bool dbg_dircache_info(void) | 1822 | static bool dbg_dircache_info(void) |
1823 | { | 1823 | { |
1824 | dircache_callback(0,0); | ||
1825 | dbg_list("Dircache Info",7, 1, dircache_callback, dbg_listmessage_getname); | 1824 | dbg_list("Dircache Info",7, 1, dircache_callback, dbg_listmessage_getname); |
1826 | return false; | 1825 | return false; |
1827 | } | 1826 | } |
@@ -1851,7 +1850,6 @@ static int database_callback(int btn, struct gui_synclist *lists) | |||
1851 | } | 1850 | } |
1852 | static bool dbg_tagcache_info(void) | 1851 | static bool dbg_tagcache_info(void) |
1853 | { | 1852 | { |
1854 | database_callback(0,0); | ||
1855 | dbg_list("Database Info",7, 1, database_callback, dbg_listmessage_getname); | 1853 | dbg_list("Database Info",7, 1, database_callback, dbg_listmessage_getname); |
1856 | return false; | 1854 | return false; |
1857 | } | 1855 | } |
@@ -1988,8 +1986,7 @@ static int radio_callback(int btn, struct gui_synclist *lists) | |||
1988 | (unsigned)info.write_regs[2], (unsigned)info.write_regs[3], | 1986 | (unsigned)info.write_regs[2], (unsigned)info.write_regs[3], |
1989 | (unsigned)info.write_regs[4]); | 1987 | (unsigned)info.write_regs[4]); |
1990 | #endif | 1988 | #endif |
1991 | if (lists) | 1989 | btn = ACTION_REDRAW; |
1992 | gui_synclist_draw(lists); | ||
1993 | } | 1990 | } |
1994 | else | 1991 | else |
1995 | snprintf(debug_list_messages[radio_lines++], DEBUG_MSG_LEN, "HW detected: no"); | 1992 | snprintf(debug_list_messages[radio_lines++], DEBUG_MSG_LEN, "HW detected: no"); |
@@ -1997,7 +1994,6 @@ static int radio_callback(int btn, struct gui_synclist *lists) | |||
1997 | } | 1994 | } |
1998 | static bool dbg_fm_radio(void) | 1995 | static bool dbg_fm_radio(void) |
1999 | { | 1996 | { |
2000 | radio_callback(0,0); | ||
2001 | dbg_list("FM Radio",radio_lines, 1, | 1997 | dbg_list("FM Radio",radio_lines, 1, |
2002 | radio_callback, dbg_listmessage_getname); | 1998 | radio_callback, dbg_listmessage_getname); |
2003 | return false; | 1999 | return false; |