WinGui:

- Only display version number on the nightly builds

git-svn-id: svn://localhost/HandBrake/trunk@3273 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Installer/MakeNightly.nsi b/win/C#/Installer/MakeNightly.nsi
index f1011a4..947c6a9 100644 (file)
--- a/win/C#/Installer/MakeNightly.nsi
+++ b/win/C#/Installer/MakeNightly.nsi
@@ -8,8 +8,8 @@
 \r
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "Handbrake"\r
-!define PRODUCT_VERSION "3247 Nightly"\r
-!define PRODUCT_VERSION_NUMBER "svn3247"\r
+!define PRODUCT_VERSION "3265 Nightly"\r
+!define PRODUCT_VERSION_NUMBER "svn3265"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index cbf7cf5..d817372 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@ using System.Runtime.InteropServices;
 //      Revision\r
 //\r
 \r
-[assembly: AssemblyVersion("0.9.4.3265")]\r
+[assembly: AssemblyVersion("0.9.4.5")]\r
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3e7c220..c411699 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -66,8 +66,12 @@ namespace Handbrake
             Application.DoEvents();\r
             Main.SetCliVersionData();\r
             Main.CheckForValidCliVersion();\r
-            Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;\r
-            this.Text += " " + v.ToString(4);\r
+\r
+            if (Settings.Default.hb_version.Contains("svn"))\r
+            {\r
+                Version v = Assembly.GetExecutingAssembly().GetName().Version;\r
+                this.Text += " " + v.ToString(4);\r
+            }\r
 \r
             // Show the form, but leave disabled until preloading is complete then show the main form)\r
             this.Enabled = false;\r