summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-04-28 18:08:48 +0000
committersr55 <[email protected]>2010-04-28 18:08:48 +0000
commit14c48362b692fc48c808b92500623eaf4862d1bb (patch)
treeb70d885ad8a403398d8241324e19bb0b8377193d /win
parent4c0d4df9984e520961b467fde1ab1c2ee7513a67 (diff)
WinGui:
- Only display version number on the nightly builds git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3273 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r--win/C#/Installer/MakeNightly.nsi4
-rw-r--r--win/C#/Properties/AssemblyInfo.cs2
-rw-r--r--win/C#/frmMain.cs8
3 files changed, 9 insertions, 5 deletions
diff --git a/win/C#/Installer/MakeNightly.nsi b/win/C#/Installer/MakeNightly.nsi
index f1011a4df..947c6a99c 100644
--- a/win/C#/Installer/MakeNightly.nsi
+++ b/win/C#/Installer/MakeNightly.nsi
@@ -8,8 +8,8 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Handbrake"
-!define PRODUCT_VERSION "3247 Nightly"
-!define PRODUCT_VERSION_NUMBER "svn3247"
+!define PRODUCT_VERSION "3265 Nightly"
+!define PRODUCT_VERSION_NUMBER "svn3265"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index cbf7cf5fd..d8173724d 100644
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@ using System.Runtime.InteropServices;
// Revision
//
-[assembly: AssemblyVersion("0.9.4.3265")]
+[assembly: AssemblyVersion("0.9.4.5")]
[assembly: NeutralResourcesLanguage("")] \ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3e7c2209a..c4116997d 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -66,8 +66,12 @@ namespace Handbrake
Application.DoEvents();
Main.SetCliVersionData();
Main.CheckForValidCliVersion();
- Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
- this.Text += " " + v.ToString(4);
+
+ if (Settings.Default.hb_version.Contains("svn"))
+ {
+ Version v = Assembly.GetExecutingAssembly().GetName().Version;
+ this.Text += " " + v.ToString(4);
+ }
// Show the form, but leave disabled until preloading is complete then show the main form)
this.Enabled = false;