don't display the WPS after loading, it made rockbox crash with some WPS'

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8209 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 11 insertions, 53 deletions

diff --git a/apps/filetree.c b/apps/filetree.c
index b870f969b5..cb21b71eec 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -381,7 +381,7 @@ int ft_enter(struct tree_context* c)
 
                 /* wps config file */
             case TREE_ATTR_WPS:
-                wps_data_load(gui_wps[0].data, buf, true, true);
+                wps_data_load(gui_wps[0].data, buf, true);
                 set_file(buf, (char *)global_settings.wps_file,
                          MAX_FILENAME);
                 break;
@@ -389,7 +389,7 @@ int ft_enter(struct tree_context* c)
 #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
                 /* remote-wps config file */
             case TREE_ATTR_RWPS:
-                wps_data_load(gui_wps[1].data, buf, true, true);
+                wps_data_load(gui_wps[1].data, buf, true);
                 set_file(buf, (char *)global_settings.rwps_file,
                          MAX_FILENAME);
                 break;
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 699635df1d..87c6a9ce63 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -2083,11 +2083,11 @@ bool gui_wps_display(void)
                                       "%al%pc/%pt%ar[%pp:%pe]\n"
                                       "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n"
                                       "%pb\n"
-                                      "%pm\n", false, false);
+                                      "%pm\n", false);
 #else
                         wps_data_load(gui_wps[i].data,
                                       "%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>\n"
-                                      "%pc%?ps<*|/>%pt\n", false, false);
+                                      "%pc%?ps<*|/>%pt\n", false);
 #endif
                     }
 #if NB_SCREENS == 2
@@ -2099,7 +2099,7 @@ bool gui_wps_display(void)
                                        "%s%?it<%?in<%in. |>%it|%fn>\n"
                                        "%al%pc/%pt%ar[%pp:%pe]\n"
                                        "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n"
-                                       "%pb", false, false);
+                                       "%pb", false);
                      }
 #endif
                 }
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index bd7591fb37..efe207f94a 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -752,10 +752,8 @@ static void wps_reset(struct wps_data *data)
    from a (wps-)file (isfile = true)*/
 bool wps_data_load(struct wps_data *wps_data,
                    const char *buf,
-                   bool isfile,
-                   bool display)
+                   bool isfile)
 {
-    int i, s;
     int fd;
 
     if(!wps_data || !buf)
@@ -832,45 +830,6 @@ bool wps_data_load(struct wps_data *wps_data,
     
             close(fd);
     
-            if ( display ) {
-                bool any_defined_line;
-                int z;
-                FOR_NB_SCREENS(z)
-                    screens[z].clear_display();
-#ifdef HAVE_LCD_BITMAP
-                FOR_NB_SCREENS(z)
-                    screens[z].setmargins(0,0);
-#endif
-                for (s=0; s<WPS_MAX_SUBLINES; s++)
-                {
-                    any_defined_line = false;
-                    for (i=0; i<WPS_MAX_LINES; i++)
-                    {
-                        if (wps_data->format_lines[i][s] &&
-                            wps_data->format_lines[i][s][0])
-                        {
-                            FOR_NB_SCREENS(z)
-                                screens[z].puts(0, i,
-                                                wps_data->
-                                                format_lines[i][s]);
-                            any_defined_line = true;
-                        }
-                        else
-                        {
-                            FOR_NB_SCREENS(z)
-                                screens[z].puts(0, i, " ");
-                        }
-                    }
-                    if (any_defined_line)
-                    {
-#ifdef HAVE_LCD_BITMAP
-                        FOR_NB_SCREENS(z)
-                            screens[z].update();
-#endif
-                        sleep(HZ/2);
-                    }
-                }
-            }
             wps_data->wps_loaded = true;
     
             return start > 0;
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 4072e17cfa..54b3d1ec64 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -282,8 +282,7 @@ void wps_data_init(struct wps_data *wps_data);
    from a (wps-)file (isfile = true)*/
 bool wps_data_load(struct wps_data *wps_data,
                    const char *buf,
-                   bool isfile,
-                   bool display);
+                   bool isfile);
 
 /* wps_data end */
 
diff --git a/apps/settings.c b/apps/settings.c
index da17695120..22bfc9b60f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -923,7 +923,7 @@ void settings_apply(void)
          global_settings.wps_file[0] != 0xff ) {
         snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
                  global_settings.wps_file);
-        wps_data_load(gui_wps[0].data, buf, true, false);
+        wps_data_load(gui_wps[0].data, buf, true);
     }
     else
         wps_data_init(gui_wps[0].data);
@@ -933,7 +933,7 @@ void settings_apply(void)
          global_settings.rwps_file[0] != 0xff ) {
         snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
                  global_settings.rwps_file);
-        wps_data_load(gui_wps[1].data, buf, true, false);
+        wps_data_load(gui_wps[1].data, buf, true);
     }
     else
         wps_data_init(gui_wps[1].data);
@@ -1205,12 +1205,12 @@ bool settings_load_config(const char* file)
 
         /* check for the string values */
         if (!strcasecmp(name, "wps")) {
-            if (wps_data_load(gui_wps[0].data,value,true, false))
+            if (wps_data_load(gui_wps[0].data, value, true))
                 set_file(value, (char *)global_settings.wps_file, MAX_FILENAME);
         }
 #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
         else if (!strcasecmp(name, "rwps")) {
-            if (wps_data_load(gui_wps[1].data,value,true, false))
+            if (wps_data_load(gui_wps[1].data, value, true))
                 set_file(value, (char *)global_settings.rwps_file, MAX_FILENAME);
         }
 #endif