Index: apps/gui/wps_parser.c
===================================================================
--- apps/gui/wps_parser.c	(revision 16170)
+++ apps/gui/wps_parser.c	(working copy)
@@ -647,12 +647,12 @@ static int parse_albumart_load(const cha
 {
     const char *_pos, *newline;
     bool parsing;
-    const short xalign_mask = WPS_ALBUMART_ALIGN_LEFT |
-                              WPS_ALBUMART_ALIGN_CENTER |
-                              WPS_ALBUMART_ALIGN_RIGHT;
-    const short yalign_mask = WPS_ALBUMART_ALIGN_TOP |
-                              WPS_ALBUMART_ALIGN_CENTER |
-                              WPS_ALBUMART_ALIGN_BOTTOM;
+    const unsigned short xalign_mask = WPS_ALBUMART_ALIGN_LEFT |
+                                       WPS_ALBUMART_ALIGN_CENTER |
+                                       WPS_ALBUMART_ALIGN_RIGHT;
+    const unsigned short yalign_mask = WPS_ALBUMART_ALIGN_TOP |
+                                       WPS_ALBUMART_ALIGN_CENTER |
+                                       WPS_ALBUMART_ALIGN_BOTTOM;
 
     (void)token; /* silence warning */
 
@@ -699,20 +699,20 @@ static int parse_albumart_load(const cha
             case 'L':
             case '+':
                 wps_data->albumart_xalign =
-                    (wps_data->albumart_xalign & xalign_mask) |
+                    (wps_data->albumart_xalign & (~xalign_mask)) |
                     WPS_ALBUMART_ALIGN_LEFT;
                 break;
             case 'c':
             case 'C':
                 wps_data->albumart_xalign =
-                    (wps_data->albumart_xalign & xalign_mask) |
+                    (wps_data->albumart_xalign & (~xalign_mask)) |
                     WPS_ALBUMART_ALIGN_CENTER;
                 break;
             case 'r':
             case 'R':
             case '-':
                 wps_data->albumart_xalign =
-                    (wps_data->albumart_xalign & xalign_mask) |
+                    (wps_data->albumart_xalign & (~xalign_mask)) |
                     WPS_ALBUMART_ALIGN_RIGHT;
                 break;
             case 'd':
@@ -759,20 +759,20 @@ static int parse_albumart_load(const cha
             case 'T':
             case '-':
                 wps_data->albumart_yalign =
-                    (wps_data->albumart_yalign & yalign_mask) |
+                    (wps_data->albumart_yalign & (~yalign_mask)) |
                     WPS_ALBUMART_ALIGN_TOP;
                 break;
             case 'c':
             case 'C':
                 wps_data->albumart_yalign =
-                    (wps_data->albumart_yalign & yalign_mask) |
+                    (wps_data->albumart_yalign & (~yalign_mask)) |
                     WPS_ALBUMART_ALIGN_CENTER;
                 break;
             case 'b':
             case 'B':
             case '+':
                 wps_data->albumart_yalign =
-                    (wps_data->albumart_yalign & yalign_mask) |
+                    (wps_data->albumart_yalign & (~yalign_mask)) |
                     WPS_ALBUMART_ALIGN_BOTTOM;
                 break;
             case 'd':