fixed bug in checking skin version

HISTORY

@@ -399,4 +399,6 @@ Version 0.6.1
 Version 0.6.2
 
 - added progressmodeonly viewelement in displayreplay
+- fixed bug in checking skin version
+
 

config.c

@@ -359,14 +359,17 @@ bool cDesignerConfig::CheckVersion(string name, string &neededVersion) {
     int verMinor = atoi(tokensVer[1].c_str());
     int verMikro = atoi(tokensVer[2].c_str());
 
-    if (minVerMajor > verMajor) {
+    if (minVerMajor < verMajor)
-        return false;
-    } else if (minVerMinor > verMinor) {
-        return false;
-    } else if (minVerMikro > verMikro) {
-        return false;
-    }
         return true;
+    if (minVerMajor > verMajor)
+        return false;
+    if (minVerMinor < verMinor)
+        return true;
+    if (minVerMinor > verMinor)
+        return false;
+    if (minVerMikro <= verMikro)
+        return true;
+    return false;
 }
 
 bool cDesignerConfig::SkinInstalled(string name) {

setup.c

@@ -201,6 +201,7 @@ eOSState cSkinDesignerSetup::ProcessKey(eKeys Key) {
         if (Key == kRed) {
             string versionNeeded = "";
             bool versionOk = config.CheckVersion(currentSkin, versionNeeded);
+            if (type == itSkinRepo) {
                 if (!versionOk) {
                     cString error = cString::sprintf("%s %s %s %s %s", 
                                                      tr("Skin Designer"),
@@ -211,12 +212,21 @@ eOSState cSkinDesignerSetup::ProcessKey(eKeys Key) {
                     Skins.Message(mtError, *error);
                     return state;
                 }
-            if (type == itSkinRepo) {
                 Skins.Message(mtStatus, *cString::sprintf("%s ...", tr("Installing Skin")));
                 StartInstallation(currentSkin);
             } else if (type == itSkinSetup || type == itNoSkinSetup) {
                 bool gitAvailable = StartUpdate(currentSkin);
                 if (gitAvailable) {
+                    if (!versionOk) {
+                        cString error = cString::sprintf("%s %s %s %s %s", 
+                                                         tr("Skin Designer"),
+                                                         tr("version"), 
+                                                         versionNeeded.c_str(),
+                                                         tr("or higher"),
+                                                         tr("needed"));
+                        Skins.Message(mtError, *error);
+                        return state;
+                    }                    
                     Skins.Message(mtStatus, *cString::sprintf("%s ...", tr("Updating Skin from Git")));
                 } else {
                     Skins.Message(mtStatus, tr("No Git Repsoitory available"));
@@ -402,6 +412,8 @@ eOSState cSkindesignerSkinSetup::ProcessKey(eKeys Key) {
             case kRed: {
                 string versionNeeded = "";
                 bool versionOk = config.CheckVersion(skin, versionNeeded);
+                bool gitAvailable = StartUpdate(skin);
+                if (gitAvailable) {
                     if (!versionOk) {
                         cString error = cString::sprintf("%s %s %s %s %s", 
                                                          tr("Skin Designer"),
@@ -412,8 +424,6 @@ eOSState cSkindesignerSkinSetup::ProcessKey(eKeys Key) {
                         Skins.Message(mtError, *error);
                         break;
                     }
-                bool gitAvailable = StartUpdate(skin);
-                if (gitAvailable) {
                     Skins.Message(mtStatus, *cString::sprintf("%s ...", tr("Updating Skin from Git")));
                 } else {
                     Skins.Message(mtStatus, tr("No Git Repsoitory available"));