From 02126560ca73d06eb9e27aa31be1010dc67cd824 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Tue, 13 Dec 2016 19:03:39 +0100 Subject: [PATCH] -Mod: Show (short) version tag in release versions -Mod: Show long version tag in builds based on a release (to separate them from real releases) --- Vocaluxe/Base/CSettings.cs | 5 +++-- Vocaluxe/Screens/CScreenMain.cs | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index 94f38509..05c52e2c 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -220,9 +220,10 @@ namespace Vocaluxe.Base { string version = _Version + " (" + _Arch + ")"; - if (VersionRevision != ERevision.Release) + string gitversion = Application.ProductVersion; + + if (VersionRevision != ERevision.Release || gitversion.Split('-')[1] != "0") { - string gitversion = Application.ProductVersion; version += " " + _GetVersionStatus() + String.Format(" ({0})", gitversion); } diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs index f45915da..a884c016 100644 --- a/Vocaluxe/Screens/CScreenMain.cs +++ b/Vocaluxe/Screens/CScreenMain.cs @@ -54,9 +54,7 @@ namespace Vocaluxe.Screens base.LoadTheme(xmlPath); _Texts[_TextRelease].Text = CSettings.GetFullVersionText(); - // ReSharper disable ConditionIsAlwaysTrueOrFalse - _Texts[_TextRelease].Visible = CSettings.VersionRevision != ERevision.Release; - // ReSharper restore ConditionIsAlwaysTrueOrFalse + _Texts[_TextRelease].Visible = true; _Statics[_StaticWarningProfiles].Visible = false; _Texts[_TextWarningProfiles].Visible = false; }