changeset 4132:bfb987da66f0

if skin doesn't provide ini file use defaults (Bugzilla #55)

--- a/src/audacious/skin.c	Sun Dec 30 12:46:13 2007 +0100
+++ b/src/audacious/skin.c	Sun Dec 30 20:20:15 2007 +0100
@@ -640,6 +640,8 @@
         return;
 
     inifile = open_ini_file(filename);
+    if (!inifile)
+        return;
 
     tmp = read_ini_string(inifile, "skin", "mainwinOthertext");
 
@@ -1432,7 +1434,8 @@
     AUDDBG("Loading pixmaps in %s\n", path);
 
     for (i = 0; i < SKIN_PIXMAP_COUNT; i++)
-        skin_load_pixmap_id(skin, i, path);
+        if (!skin_load_pixmap_id(skin, i, path))
+            return FALSE;
 
     text_pm = skin->pixmaps[SKIN_TEXT].pixmap;
 
@@ -1446,11 +1449,6 @@
     filename = find_file_recursively(path, "pledit.txt");
     inifile = open_ini_file(filename);
 
-    if (!inifile) {
-        AUDDBG("Can't load inifile %s\n", filename);
-        return FALSE;
-    }
-
     skin->colors[SKIN_PLEDIT_NORMAL] =
         skin_load_color(inifile, "Text", "Normal", "#2499ff");
     skin->colors[SKIN_PLEDIT_CURRENT] =
@@ -1460,9 +1458,11 @@
     skin->colors[SKIN_PLEDIT_SELECTEDBG] =
         skin_load_color(inifile, "Text", "SelectedBG", "#0a124a");
 
+    if (inifile)
+        close_ini_file(inifile);
+
     if (filename)
         g_free(filename);
-    close_ini_file(inifile);
 
     skin_mask_create(skin, path, SKIN_MASK_MAIN, mainwin->window);
     skin_mask_create(skin, path, SKIN_MASK_MAIN_SHADE, mainwin->window);