From d9a1bf4a0d5a3959db2db0123f98653540dabde3 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 8 Jan 2016 20:32:44 +0100
Subject: [PATCH] Better handling of running an old installer with new version
 installed

* Better late than never? :)
---
 installer/Installer32.wxs | 5 +++++
 installer/Installer64.wxs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/installer/Installer32.wxs b/installer/Installer32.wxs
index e65716649..39882e3fb 100644
--- a/installer/Installer32.wxs
+++ b/installer/Installer32.wxs
@@ -27,8 +27,13 @@
                       IncludeMaximum="yes"
                       Maximum="$(env.RENDERDOC_VERSION)"
                       Property="OLDERVERSIONBEINGUPGRADED" />
+      <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONDETECTED" Minimum="$(env.RENDERDOC_VERSION)" IncludeMinimum="no" />
     </Upgrade>
 
+    <Condition Message="A later version of [ProductName] is already installed"> 
+      NOT NEWERVERSIONDETECTED
+    </Condition> 
+
     <Media Id='1' Cabinet='renderdoc.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
     <Property Id='DiskPrompt' Value="RenderDoc Installation [1]" />
 
diff --git a/installer/Installer64.wxs b/installer/Installer64.wxs
index b1dcc99ba..f58c5a02c 100644
--- a/installer/Installer64.wxs
+++ b/installer/Installer64.wxs
@@ -17,8 +17,13 @@
                       IncludeMaximum="yes"
                       Maximum="$(env.RENDERDOC_VERSION)"
                       Property="OLDERVERSIONBEINGUPGRADED" />
+      <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONDETECTED" Minimum="$(env.RENDERDOC_VERSION)" IncludeMinimum="no" />
     </Upgrade>
 
+    <Condition Message="A later version of [ProductName] is already installed"> 
+      NOT NEWERVERSIONDETECTED
+    </Condition> 
+
     <Media Id='1' Cabinet='renderdoc.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
     <Property Id='DiskPrompt' Value="RenderDoc Installation [1]" />