Changeset 32883

Timestamp:

02/06/15 14:46:19 (8 years ago)

Author:

gost

Message:

[titan] fix skinselector

File:

• titan/titan/skinselector.h (modified) (3 diffs)

titan/titan/skinselector.h

@@ -201 +201 @@
                                 int count1 = 0;
                                 char* tmpstr1 = NULL;
+                                char* cmd = NULL;
                                 tmpstr1 = ostrcat("", selection->name, 0, 0);
                                 ret1 = strsplit(tmpstr1, " ", &count1);
@@ -209 +210 @@
                                 tmpstr = dirname(tmpstr);
                                 printf("skin install dir: %s\n", tmpstr);
-
-                                if(ostrstr(tmpstr, "/var/usr/local/share/titan/skin/default") != NULL)
-                                        tmpstr = ostrcat(tmpstr, "/skinconfig", 1, 0);
-                                else
-                                {
-                                        free(tmpstr), tmpstr = NULL;
-                                        tmpstr = ostrcat("/mnt/config/skinconfig", NULL, 0, 0);
-                                }
-
-                                printf("skinconfig dir: %s\n", tmpstr);
-
+        
+                                tmpstr = ostrcat(tmpstr, "/skinconfig", 1, 0);
                                 if(file_exist(tmpstr))
                                 {
-                                        addconfig("skinconfig", tmpstr);
-                                        free(tmpstr); tmpstr = NULL;
+                                        if(ostrstr(getconfig("skinconfig", NULL), "/mnt/config/skinconfig") != NULL)
+                                        {       
+                                                cmd = ostrcat("cp -r ", getconfig("skinconfig", NULL), 0, 0);
+                                                cmd = ostrcat(cmd, " ", 1, 0);
+                                                cmd = ostrcat(cmd, getconfig("skinpath", NULL), 1, 0);
+                                                system(cmd);
+                                                free(cmd); cmd = NULL;
+                                        
+                                                cmd = ostrcat("cp -r ", tmpstr, NULL), 0, 0);
+                                                cmd = ostrcat(cmd, " ", 1, 0);
+                                                cmd = ostrcat(cmd, getconfig("skinconfig", NULL), 1, 0);
+                                                system(cmd);
+                                                free(cmd); cmd = NULL;
+                                        }
+                                        else
+                                        {
+                                                addconfig("skinconfig", tmpstr);
+                                        }
                                 }
                                 else
@@ -232 +240 @@
                                         continue;
                                 }
-
+                                free(tmpstr), tmpstr = NULL;
+                                
                                 addconfig("skinfile", selection->name);