2 files changed, 5 insertions, 5 deletions

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index fad6912336..46adbdc097 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -53,7 +53,6 @@
 #include "viewport.h"
 
 #include "wps_internals.h"
-#include "wps.h"
 #include "root_menu.h"
 #ifdef HAVE_RECORDING
 #include "recording.h"
@@ -525,7 +524,7 @@ const char *get_token_value(struct gui_wps *gwps,
             int mode = 1; /* stop */
             if (status == STATUS_PLAY)
                 mode = 2; /* play */
-            if (is_wps_fading() || 
+            if (state->is_fading || 
                (status == STATUS_PAUSE  && !status_get_ffmode()))
                 mode = 3; /* pause */
             else
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index d54b54ff00..8763ef9e3d 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -288,12 +288,13 @@ struct wps_data
    and some status infos */
 struct wps_state
 {
+    struct mp3entry* id3;
+    struct mp3entry* nid3;
+    int  ff_rewind_count;
     bool ff_rewind;
     bool paused;
-    int ff_rewind_count;
     bool wps_time_countup;
-    struct mp3entry* id3;
-    struct mp3entry* nid3;
+    bool is_fading;
 };
 
 /* Holds data for all screens in a skin. */