MP1-5185: MPE: Swap BUILD with REVISION when reading MP uninstall reg…

…istry
MediaPortal · Jan 26, 2024 · c1f4456 · c1f4456
1 parent 5a20a79
commit c1f4456
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mediaportal/MPE/MpeCore/Classes/VersionProvider/MediaPortalVersion.cs b/mediaportal/MPE/MpeCore/Classes/VersionProvider/MediaPortalVersion.cs
@@ -46,10 +46,11 @@ public override VersionInfo Version(string id)
       {
         VersionInfo version = new VersionInfo
         {
-          Build = ((int)key.GetValue("VersionBuild", 0)).ToString(),
           Major = ((int)key.GetValue("VersionMajor", 0)).ToString(),
           Minor = ((int)key.GetValue("VersionMinor", 0)).ToString(),
-          Revision = ((int)key.GetValue("VersionRevision", 0)).ToString(),
+          //NSIS has swapped revision with build; :((((
+          Revision = ((int)key.GetValue("VersionBuild", 0)).ToString(),
+          Build = ((int)key.GetValue("VersionRevision", 0)).ToString(),
         };
         key.Close();
         return version;

diff --git a/mediaportal/MPE/MpeCore/Classes/VersionProvider/TvServerVersion.cs b/mediaportal/MPE/MpeCore/Classes/VersionProvider/TvServerVersion.cs
@@ -39,10 +39,11 @@ public override VersionInfo Version(string id)
       {
         var version = new VersionInfo
                         {
-                          Build = ((int)key.GetValue("VersionBuild", 0)).ToString(),
                           Major = ((int)key.GetValue("VersionMajor", 0)).ToString(),
                           Minor = ((int)key.GetValue("VersionMinor", 0)).ToString(),
-                          Revision = ((int)key.GetValue("VersionRevision", 0)).ToString(),
+                          //NSIS has swapped revision with build; :((((
+                          Revision = ((int)key.GetValue("VersionBuild", 0)).ToString(),
+                          Build = ((int)key.GetValue("VersionRevision", 0)).ToString(),
                         };
         key.Close();
         return version;