summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Levin <al.le@rockbox.org>2009-06-24 20:17:17 +0000
committerAlexander Levin <al.le@rockbox.org>2009-06-24 20:17:17 +0000
commit119cfdaa0ab21130ec17fafbe869996ec741abe8 (patch)
tree45a9330dfa81f1a8cd75426d699aafec1f789e3a
parent5acfa34b9c60b9a2e5236b0fecd96e2c54e4e242 (diff)
downloadrockbox-119cfdaa0ab21130ec17fafbe869996ec741abe8.tar.gz
rockbox-119cfdaa0ab21130ec17fafbe869996ec741abe8.zip
Do not unnecessarily change and restore the status bar setting (part of FS#10138 by Teruaki Kawashima)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21493 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/properties.c9
-rw-r--r--apps/plugins/text_editor.c4
2 files changed, 0 insertions, 13 deletions
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index 81e10812cc..18beec2da6 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -274,7 +274,6 @@ enum plugin_status plugin_start(const void* parameter)
274{ 274{
275 struct gui_synclist properties_lists; 275 struct gui_synclist properties_lists;
276 int button; 276 int button;
277 bool prev_show_statusbar;
278 bool quit = false; 277 bool quit = false;
279 char file[MAX_PATH]; 278 char file[MAX_PATH];
280 rb->strcpy(file, (const char *) parameter); 279 rb->strcpy(file, (const char *) parameter);
@@ -321,10 +320,6 @@ enum plugin_status plugin_start(const void* parameter)
321 return PLUGIN_OK; 320 return PLUGIN_OK;
322 } 321 }
323 322
324 /* prepare the list for the user */
325 prev_show_statusbar = rb->global_settings->statusbar;
326 rb->global_settings->statusbar = false;
327
328 rb->gui_synclist_init(&properties_lists, &get_props, file, false, 1, NULL); 323 rb->gui_synclist_init(&properties_lists, &get_props, file, false, 1, NULL);
329 rb->gui_synclist_set_title(&properties_lists, its_a_dir ? 324 rb->gui_synclist_set_title(&properties_lists, its_a_dir ?
330 "Directory properties" : 325 "Directory properties" :
@@ -347,13 +342,9 @@ enum plugin_status plugin_start(const void* parameter)
347 break; 342 break;
348 default: 343 default:
349 if (rb->default_event_handler(button) == SYS_USB_CONNECTED) 344 if (rb->default_event_handler(button) == SYS_USB_CONNECTED)
350 {
351 rb->global_settings->statusbar = prev_show_statusbar;
352 return PLUGIN_USB_CONNECTED; 345 return PLUGIN_USB_CONNECTED;
353 }
354 } 346 }
355 } 347 }
356 rb->global_settings->statusbar = prev_show_statusbar;
357 348
358 return PLUGIN_OK; 349 return PLUGIN_OK;
359} 350}
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c
index 911b64e7ab..703b330d6c 100644
--- a/apps/plugins/text_editor.c
+++ b/apps/plugins/text_editor.c
@@ -326,14 +326,11 @@ enum plugin_status plugin_start(const void* parameter)
326 bool changed = false; 326 bool changed = false;
327 int cur_sel=0; 327 int cur_sel=0;
328 static char copy_buffer[MAX_LINE_LEN]; 328 static char copy_buffer[MAX_LINE_LEN];
329 bool prev_show_statusbar;
330#ifdef HAVE_LCD_COLOR 329#ifdef HAVE_LCD_COLOR
331 bool edit_colors_file = false; 330 bool edit_colors_file = false;
332#endif 331#endif
333 332
334 copy_buffer[0]='\0'; 333 copy_buffer[0]='\0';
335 prev_show_statusbar = rb->global_settings->statusbar;
336 rb->global_settings->statusbar = false;
337 334
338#if LCD_DEPTH > 1 335#if LCD_DEPTH > 1
339 rb->lcd_set_backdrop(NULL); 336 rb->lcd_set_backdrop(NULL);
@@ -515,6 +512,5 @@ enum plugin_status plugin_start(const void* parameter)
515 } 512 }
516 rb->gui_synclist_set_nb_items(&lists,line_count); 513 rb->gui_synclist_set_nb_items(&lists,line_count);
517 } 514 }
518 rb->global_settings->statusbar = prev_show_statusbar;
519 return PLUGIN_OK; 515 return PLUGIN_OK;
520} 516}