Changeset 32303

Timestamp:

01/11/15 02:51:50 (9 years ago)

Author:

tobayer

Message:

[titan] add infobar selection, step 3

Location:

titan/titan

Files:

• infobar.h (modified) (1 diff)
• skinadjust.h (modified) (1 diff)

titan/titan/infobar.h

@@ -7 +7 @@
         struct channel* pipchannel = NULL; 
         struct skin* playinfobarpic = getscreen("playinfobarpic");
-        struct skin* infobar1 = getscreen("infobar");
-        struct skin* infobar2 = getscreen("infobar2");
+
+        char* infobar_sel = getskinconfig("infobar2_selection", NULL);
+        char* infobar2_sel = getskinconfig("infobar2_selection", NULL);
+        if(infobar_sel == NULL) ostrcat(infobar_sel, "infobar", 0, 0); // fallback to default
+        if(infobar2_sel == NULL) ostrcat(infobar_sel, "infobar2", 0, 0); // fallback to default
+
+        struct skin* infobar1 = getscreen(infobar_sel);
+        struct skin* infobar2 = getscreen(infobar2_sel);
         struct skin* infobar = infobar1;
         struct skin* infobarm = infobar1;
+
+        free(infobar_sel); infobar_sel=NULL;free(infobar2_sel); infobar2_sel=NULL;
+
         struct skin* standbymenu = NULL;
         char* tmpstr = NULL; char* tmpnr = NULL;

titan/titan/skinadjust.h

@@ -251 +251 @@
                         addskinconfigscreencheck("infobar_selection", infobar_sel, "0");
                         if(ostrcmp(oldinfobar_sel,getskinconfig("infobar_selection", NULL)) != 0) reboot = 1;
+                        free(oldinfobar_sel); oldinfobar_sel=NULL;
 
                         char* oldinfobar2_sel = getskinconfig("infobar2_selection", NULL);
                         addskinconfigscreencheck("infobar2_selection", infobar2_sel, "0");
                         if(ostrcmp(oldinfobar2_sel,getskinconfig("infobar2_selection", NULL)) != 0) reboot = 1;
+                        free(oldinfobar2_sel); oldinfobar2_sel=NULL;
 
                         writeskinconfigtmp();