From f21fa39670a5aef068babde7c0a6614689a9a4e3 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Thu, 13 Jun 2019 10:55:12 -0700
Subject: [PATCH] Always install PX4 Drivers

---
 ChangeLog.md                        |  4 +++-
 deploy/qgroundcontrol_installer.nsi | 22 +---------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 468917cc0..f2311cd03 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -8,7 +8,9 @@ Note: This file only contains high level features or important fixes.
 
 * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
 
-### 3.5.3 - Not yet released
+### 3.5.3 - Stable
+* Change Crash Dump to mini-dumps
+* Always install PX4 drivers, even if already there
 * Fix crash when clicking on GeoFence polygon vertex
 * PX4: Fix missing ```MC_YAW_FF``` parameter in PID Tuning
 * ArduPilot: Fix parameter file save generating bad characters from git hash
diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/qgroundcontrol_installer.nsi
index 60ee26780..bc48f261a 100644
--- a/deploy/qgroundcontrol_installer.nsi
+++ b/deploy/qgroundcontrol_installer.nsi
@@ -78,29 +78,9 @@ doinstall:
   WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\${EXENAME}-Uninstall.exe$\""
   SetRegView 64
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpCount" 5 
-  WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpType" 1
+  WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpType" 2
   WriteRegExpandStr HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpFolder" "%LOCALAPPDATA%\QGCCrashDumps"
-
-  ; Only attempt to install the PX4 driver if the version isn't present
-  !define ROOTKEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\434608CF2B6E31F0DDBA5C511053F957B55F098E"
-
-  SetRegView 64
-  ReadRegStr $0 HKLM "${ROOTKEY}" "Publisher"
-  StrCmp     $0 "3D Robotics" found_provider notfound
-
-found_provider:
-  ReadRegStr $0 HKLM "${ROOTKEY}" "DisplayVersion"
-  DetailPrint "Checking USB driver version... $0"
-  StrCmp     $0 "04/11/2013 2.0.0.4" skip_driver notfound
-
-notfound:
-  DetailPrint "USB Driver not found... installing"
   ExecWait '"msiexec" /i "px4driver.msi"'
-  goto done
-
-skip_driver:
-  DetailPrint "USB Driver found... skipping install"
-done:
   SetRegView lastused
 SectionEnd 
 
-- 
2.22.0