diff gui/skin/skin.c @ 33069:4b7d4905862c

Rename error message and add missing checks. MSGTR_SKIN_BITMAP_UnknownMessage has nothing to do with bitmaps. The return codes have been changed (resp. added) to indicate the error.

--- a/gui/skin/skin.c	Wed Mar 30 11:32:12 2011 +0000
+++ b/gui/skin/skin.c	Wed Mar 30 12:07:54 2011 +0000
@@ -380,8 +380,8 @@
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    button image: %s %d,%d\n", fname, x, y);
 
     if ((currWinItems[*currWinItemIdx].message = appFindMessage(msg)) == -1) {
-        skin_error(MSGTR_SKIN_BITMAP_UnknownMessage, msg);
-        return 0;
+        skin_error(MSGTR_SKIN_UnknownMessage, msg);
+        return 1;
     }
 
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     message: %s (#%d)\n", msg, currWinItems[*currWinItemIdx].message);
@@ -477,8 +477,10 @@
 
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    item #%d: %d,%d %dx%d\n", skin->IndexOfMenuItems, x, y, sx, sy);
 
-    if ((skin->menuItems[skin->IndexOfMenuItems].message = message) == -1)
-        skin_error(MSGTR_SKIN_BITMAP_UnknownMessage, tmp);
+    if ((skin->menuItems[skin->IndexOfMenuItems].message = message) == -1) {
+        skin_error(MSGTR_SKIN_UnknownMessage, tmp);
+        return 1;
+    }
 
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     message: %s (#%d)\n", tmp, skin->menuItems[skin->IndexOfMenuItems].message);
 
@@ -518,6 +520,11 @@
 
     message = appFindMessage(tmp);
 
+    if (message == -1) {
+        skin_error(MSGTR_SKIN_UnknownMessage, tmp);
+        return 1;
+    }
+
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    h/v potmeter image: %s %d,%d %dx%d\n", phfname, x, y, sx, sy);
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     button image: %s %dx%d\n", pfname, pwidth, pheight);
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     numphases: %d, default: %d%%\n", ph, d);
@@ -606,6 +613,11 @@
 
     message = appFindMessage(tmp);
 
+    if (message == -1) {
+        skin_error(MSGTR_SKIN_UnknownMessage, tmp);
+        return 1;
+    }
+
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    potmeter image: %s %d,%d %dx%d\n", phfname, x, y, sx, sy);
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     numphases: %d, default: %d%%\n", ph, d);
     mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     message: %s (#%d)\n", tmp, message);