3 files changed, 26 insertions, 25 deletions

diff --git a/utils/wpseditor/libwps/src/api.c b/utils/wpseditor/libwps/src/api.c
index 485efa8e00..89538423b4 100644
--- a/utils/wpseditor/libwps/src/api.c
+++ b/utils/wpseditor/libwps/src/api.c
@@ -32,8 +32,7 @@ bool load_remote_wps_backdrop(char* filename) {
 }
 
 int read_bmp_file(const char* filename,struct bitmap *bm, int maxsize,int format) {
-    if (!xapi->read_bmp_file)
-    {
+    if (!xapi->read_bmp_file) {
         DEBUGF1("can't read bmp file! NULL api!\n");
         return -1;
     }
@@ -84,7 +83,7 @@ int getstringsize(const unsigned char *str, int *w, int *h) {
     return 1;
 }
 
-void set_wpsstate(struct wpsstate state){
+void set_wpsstate(struct wpsstate state) {
     sysfont.height = state.fontheight;
     sysfont.maxwidth = state.fontwidth;
     global_settings.volume = state.volume;
@@ -92,7 +91,10 @@ void set_wpsstate(struct wpsstate state){
     _audio_status = state.audio_status;
 }
 
-void set_trackstate(struct trackstate state){
+void set_trackstate(struct trackstate state) {
+    if (!(gui_wps[0].state) ||
+        !(gui_wps[0].state->id3))
+        return;
     gui_wps[0].state->id3->title = state.title;
     gui_wps[0].state->id3->artist = state.artist;
     gui_wps[0].state->id3->album = state.album;
@@ -100,8 +102,7 @@ void set_trackstate(struct trackstate state){
     gui_wps[0].state->id3->length = state.length;
 }
 
-void set_next_trackstate(struct trackstate state)
-{
+void set_next_trackstate(struct trackstate state) {
     gui_wps[0].state->nid3->title = state.title;
     gui_wps[0].state->nid3->artist = state.artist;
     gui_wps[0].state->nid3->album = state.album;
@@ -110,21 +111,21 @@ void set_next_trackstate(struct trackstate state)
 }
 
 enum api_playmode playmodes[PLAYMODES_NUM] = {
-    API_STATUS_PLAY,
-    API_STATUS_STOP,
-    API_STATUS_PAUSE,
-    API_STATUS_FASTFORWARD,
-    API_STATUS_FASTBACKWARD
-};
+            API_STATUS_PLAY,
+            API_STATUS_STOP,
+            API_STATUS_PAUSE,
+            API_STATUS_FASTFORWARD,
+            API_STATUS_FASTBACKWARD
+        };
 
 const char *playmodeNames[] = {
-    "Play", "Stop", "Pause", "FastForward", "FastBackward"
-};
+                                  "Play", "Stop", "Pause", "FastForward", "FastBackward"
+                              };
 
 
-void set_audio_status(int status){
+void set_audio_status(int status) {
     DEBUGF1("%s",playmodeNames[status]);
-    switch(status){
+    switch (status) {
         case API_STATUS_PLAY:
             _audio_status = AUDIO_STATUS_PLAY;
             status_set_ffmode(STATUS_PLAY);
@@ -203,8 +204,6 @@ int set_api(struct proxy_api* api) {
 #else
     screens[0].is_color=false;
 #endif
-    if (api->getwidth)
-        screens[0].getwidth = api->getwidth;
     if (api->stop_scroll)
         screens[0].stop_scroll=api->stop_scroll;
     screens[0].scroll_stop = lcd_scroll_stop;
@@ -266,3 +265,4 @@ int set_api(struct proxy_api* api) {
 
 
 
+
diff --git a/utils/wpseditor/libwps/src/proxy.c b/utils/wpseditor/libwps/src/proxy.c
index 3a3b8ce4d9..8f9218e3ff 100644
--- a/utils/wpseditor/libwps/src/proxy.c
+++ b/utils/wpseditor/libwps/src/proxy.c
@@ -69,7 +69,7 @@ void* plugin_get_buffer(size_t *buffer_size)
 int checkwps(const char *filename, int verbose){
     int res;
     int fd;
-    
+
     struct wps_data wps;
     wps_verbose_level = verbose;
 
@@ -104,9 +104,8 @@ int wps_init(const char* filename,struct proxy_api *api, bool isfile){
     if (!res)
     {
       DEBUGF1("ERR: WPS parsing failure\n");
-      return 3;
-    }
-    DEBUGF1("WPS parsed OK\n");
+    } else
+        DEBUGF1("WPS parsed OK\n");
     DEBUGF1("\n-------------------------------------------------\n");
     wps_state.paused = true;
     gwps.data = &wpsdata;
@@ -115,7 +114,7 @@ int wps_init(const char* filename,struct proxy_api *api, bool isfile){
     gwps.state->id3 = &id3;
     gwps.state->nid3 = &nid3;
     gui_wps[0] = gwps;
-    return res;
+    return (res?res:3);
 }
 
 int wps_display(){
diff --git a/utils/wpseditor/libwps/src/proxy.h b/utils/wpseditor/libwps/src/proxy.h
index 3836ecc6d0..df0abd3c3e 100644
--- a/utils/wpseditor/libwps/src/proxy.h
+++ b/utils/wpseditor/libwps/src/proxy.h
@@ -1,6 +1,8 @@
 #ifndef PROXY_H
 #define PROXY_h
 
+#include <stdio.h>
+
 #include "screen_access.h"
 #include "api.h"
 #include "defs.h"
@@ -9,13 +11,13 @@
 #define DEBUGF1 dbgf
 #define DEBUGF2(...)
 #define DEBUGF3(...)
+#define DEBUGF4(...)
 
 EXPORT int checkwps(const char *filename, int verbose);
 EXPORT int wps_init(const char* filename,struct proxy_api *api,bool isfile);
 EXPORT int wps_display();
 EXPORT int wps_refresh();
-
-const char* get_model_name();
+EXPORT const char* get_model_name();
 
 extern struct screen screens[NB_SCREENS];
 extern bool   debug_wps;