WinGui: Part 1: Fix numerous issues around app versioning. Hopefully the GUI and CLI will no longer be out of sync.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5350 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 2 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index 2fa4913a6..cb9cef3e7 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -9,7 +9,7 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using HandBrake.ApplicationServices;

+    using HandBrake.ApplicationServices.Utilities;

 

     using HandBrakeWPF.ViewModels.Interfaces;

 

@@ -33,12 +33,7 @@ namespace HandBrakeWPF.ViewModels
         {

             get

             {

-                string nightly = UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion).Contains("svn") ? " (SVN / Nightly Build)" : string.Empty;

-                return string.Format(

-                    "{0} ({1}) {2}",

-                    UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),

-                    UserSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),

-                    nightly);

+                return string.Format("{0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion());

             }

         }