Skip to content

Commit

Permalink
Merge pull request #469 from vancem/FixPerfView64OffShare
Browse files Browse the repository at this point in the history
Fix bug where PerfView64 does not launch as a 64 bit app
  • Loading branch information
vancem authored Dec 16, 2017
2 parents cd10c78 + d8fe45d commit 1ed41fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/PerfView/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private static int DoMain(string[] args, ref bool newConsoleCreated, ref StreamW
// It also can work if we only do viewing operations (msdia* uses old libraries), but again do we care?
// If we do we can move this to before the DLLs are loaded.
// Give the user a clean error.
if (Environment.Is64BitProcess && Environment.OSVersion.Version.Major < 10)
if (Environment.Is64BitProcess && Environment.OSVersion.Version.Major * 10 + Environment.OSVersion.Version.Minor < 62)
{
throw new ApplicationException("The PerfView64 does not work properly Windows version < 10\r\n" +
" Please use the 32 bit version (PerfView.exe).");
Expand Down Expand Up @@ -457,7 +457,7 @@ public static void RelaunchIfNeeded(string[] args)
return;

// Is the EXE on a network share
var exe = SupportFiles.MainAssemblyPath;
var exe = Assembly.GetEntryAssembly().ManifestModule.FullyQualifiedName;
if (!exe.StartsWith(@"\\"))
return;

Expand Down

0 comments on commit 1ed41fd

Please sign in to comment.