From 1a790ae4d42a5e9de7259a23754725fbf9f99cf6 Mon Sep 17 00:00:00 2001
From: cuu <dexterkidd@gmail.com>
Date: Wed, 26 Jun 2019 23:20:32 +0800
Subject: [PATCH] bug fix

---
 mainscreen.go          |  6 ++++--
 sysgo/UI/UI.go         |  2 +-
 sysgo/UI/util_funcs.go | 27 ++++++++++++++++-----------
 sysgo/config.go        |  2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/mainscreen.go b/mainscreen.go
index 0237cce..983a6cc 100644
--- a/mainscreen.go
+++ b/mainscreen.go
@@ -76,13 +76,15 @@ func ReunionPagesIcons(self *UI.MainScreen) {
         }
         
         var tmpswap []Tup
-        for i,x := range tmp {
+        onlyone := false
+        for _,x := range tmp {
           if strings.HasPrefix(x.FileName,retro_games_dir) == false{
             tmpswap = append(tmpswap,x)
           }
           
-          if strings.HasPrefix(x.FileName,retro_games_dir) == true && i==retro_games_idx[0] {
+          if strings.HasPrefix(x.FileName,retro_games_dir) == true && onlyone == false {
             tmpswap = append(tmpswap,x)
+            onlyone = true
           }
         }
         
diff --git a/sysgo/UI/UI.go b/sysgo/UI/UI.go
index 896f34b..f448482 100644
--- a/sysgo/UI/UI.go
+++ b/sysgo/UI/UI.go
@@ -57,7 +57,7 @@ func (self *Widget) NewCoord(x,y int) {
 func Init() {
 	font.Init()
 
-	skinpath := "skin/"+sysgo.SKIN+"/truetype"
+	skinpath :=  sysgo.SKIN+"/truetype"
 
 	Fonts = make(map[string]*ttf.Font)
 
diff --git a/sysgo/UI/util_funcs.go b/sysgo/UI/util_funcs.go
index ace510f..9e70bbb 100644
--- a/sysgo/UI/util_funcs.go
+++ b/sysgo/UI/util_funcs.go
@@ -44,23 +44,28 @@ func Abs(n int) int {
 
 
 func SkinMap(orig_file_or_dir string) string {
-	DefaultSkin := "default"
+	DefaultSkin := "skin/default"
 	ret := ""
-	skin_dir_prefix:= "skin/"
-	if strings.HasPrefix(orig_file_or_dir, "..") {
-		ret = strings.Replace(orig_file_or_dir,"..",skin_dir_prefix + sysgo.SKIN,-1)
+	lastpad := ""
+  
+  if string(orig_file_or_dir[len(orig_file_or_dir)-1]) == "/" {
+    lastpad = string(orig_file_or_dir[len(orig_file_or_dir)-1])
+  }
+  
+	if strings.HasPrefix(orig_file_or_dir, "/home/cpi/apps/Menu") {
+		ret = strings.Replace(orig_file_or_dir,"/home/cpi/apps/Menu/", filepath.Join(sysgo.SKIN,"/Menu/GameShell/"),-1)
+    if FileExists(ret) == false {
+      ret = filepath.Join(DefaultSkin,orig_file_or_dir)
+    }
+	}else { // there is no need to add insert "sysgo" in the middle
+		ret = filepath.Join(sysgo.SKIN,orig_file_or_dir) 
 		if FileExists(ret) == false {
-			ret = strings.Replace(orig_file_or_dir,"..", skin_dir_prefix + DefaultSkin,-1)
-		}
-	}else {
-		ret = skin_dir_prefix+sysgo.SKIN+"/"+orig_file_or_dir
-		if FileExists(ret) == false {
-			ret = skin_dir_prefix+DefaultSkin+"/"+orig_file_or_dir
+			ret = filepath.Join(DefaultSkin,orig_file_or_dir)
 		}
 	}
 
 	if FileExists(ret) {
-		return ret
+		return ret+lastpad
 	}else { // if not existed both in default or custom skin ,return where it is
 		return orig_file_or_dir
 	}
diff --git a/sysgo/config.go b/sysgo/config.go
index 5b502af..d35b8a5 100644
--- a/sysgo/config.go
+++ b/sysgo/config.go
@@ -19,7 +19,7 @@ var (
 
   VERSION="0.22"
 
-	SKIN="default"
+	SKIN="skin/default"
   
   //load from dot files   
   CurPowerLevel= "performance"