summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2014-09-05 22:14:26 +0000
committersr55 <[email protected]>2014-09-05 22:14:26 +0000
commit4eccd975caa1d2ece174c70546da069df3e2ad08 (patch)
treefdaac69cccd01c3a67a04d52f34a7cbd4aea68a9 /win
parent2df5f2410fb8ecd96b0ae048f3b539e885a34a83 (diff)
WinGui: Change the update checker to use the 64bit appcast when the operating system is 64bit even when the app is the 32bit version.
Added Operating bit-ness to the log header. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6392 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs2
-rw-r--r--win/CS/HandBrakeWPF/Services/UpdateService.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
index 0bf34b6a4..301145975 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
@@ -124,7 +124,7 @@ namespace HandBrake.ApplicationServices.Utilities
}
logHeader.AppendLine(String.Format("HandBrake {0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion()));
- logHeader.AppendLine(String.Format("OS: {0}", Environment.OSVersion));
+ logHeader.AppendLine(String.Format("OS: {0} - {1}", Environment.OSVersion, Environment.Is64BitOperatingSystem ? "64bit" : "32bit"));
logHeader.AppendLine(String.Format("CPU: {0}", SystemInfo.GetCpuCount));
logHeader.AppendLine(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));
logHeader.AppendLine(String.Format("GPU Information:{0}{1}", Environment.NewLine, gpuBuilder.ToString().TrimEnd()));
diff --git a/win/CS/HandBrakeWPF/Services/UpdateService.cs b/win/CS/HandBrakeWPF/Services/UpdateService.cs
index db94b56b0..85b1f4ab0 100644
--- a/win/CS/HandBrakeWPF/Services/UpdateService.cs
+++ b/win/CS/HandBrakeWPF/Services/UpdateService.cs
@@ -85,14 +85,14 @@ namespace HandBrakeWPF.Services
try
{
string url =
- VersionHelper.Is64Bit()
+ VersionHelper.Is64Bit() || Environment.Is64BitOperatingSystem
? Constants.Appcast64
: Constants.Appcast32;
if (VersionHelper.IsNightly())
{
url =
- VersionHelper.Is64Bit()
+ VersionHelper.Is64Bit() || Environment.Is64BitOperatingSystem
? Constants.AppcastUnstable64
: Constants.AppcastUnstable32;
}