diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/list.c | 8 | ||||
-rw-r--r-- | apps/main.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 4d19bbdf96..38cecaefcc 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -1285,11 +1285,11 @@ bool simplelist_show_list(struct simplelist_info *info) | |||
1285 | gui_syncstatusbar_draw(&statusbars, true); | 1285 | gui_syncstatusbar_draw(&statusbars, true); |
1286 | list_do_action(CONTEXT_STD, info->timeout, | 1286 | list_do_action(CONTEXT_STD, info->timeout, |
1287 | &lists, &action, LIST_WRAP_UNLESS_HELD); | 1287 | &lists, &action, LIST_WRAP_UNLESS_HELD); |
1288 | #ifdef SIMULATOR | 1288 | |
1289 | /* Sim has no interrupts, so this is needed for buttons to be recognised */ | 1289 | /* We must yield in this case or no other thread can run */ |
1290 | if (info->timeout == TIMEOUT_NOBLOCK) | 1290 | if (info->timeout == TIMEOUT_NOBLOCK) |
1291 | yield(); | 1291 | yield(); |
1292 | #endif | 1292 | |
1293 | if (info->action_callback) | 1293 | if (info->action_callback) |
1294 | { | 1294 | { |
1295 | action = info->action_callback(action, &lists); | 1295 | action = info->action_callback(action, &lists); |
diff --git a/apps/main.c b/apps/main.c index 366fed9585..d75bb726cf 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -113,6 +113,10 @@ | |||
113 | 113 | ||
114 | #include "cuesheet.h" | 114 | #include "cuesheet.h" |
115 | 115 | ||
116 | #ifdef SIMULATOR | ||
117 | #include "system-sdl.h" | ||
118 | #endif | ||
119 | |||
116 | /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ | 120 | /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ |
117 | 121 | ||
118 | const char appsversion[]=APPSVERSION; | 122 | const char appsversion[]=APPSVERSION; |
@@ -267,6 +271,7 @@ static void init(void) | |||
267 | { | 271 | { |
268 | init_threads(); | 272 | init_threads(); |
269 | buffer_init(); | 273 | buffer_init(); |
274 | set_irq_level(0); | ||
270 | lcd_init(); | 275 | lcd_init(); |
271 | #ifdef HAVE_REMOTE_LCD | 276 | #ifdef HAVE_REMOTE_LCD |
272 | lcd_remote_init(); | 277 | lcd_remote_init(); |