Merge branch 'release/1.1.18'

* release/1.1.18: Update version_check.php Update changelog Don't crash if someone fills out the uninstall survey while offline
canton7 · Sep 4, 2017 · 7c94434 · 7c94434
2 parents b679a4a + 3dad838
commit 7c94434
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v1.1.18
+-------
+
+ - Fix uninstaller crash if someone filled out the survey while not connected to the internet
+
 v1.1.17
 -------
 

diff --git a/installer/common.iss b/installer/common.iss
@@ -422,19 +422,23 @@ begin
     if UninstallProgressForm.ShowModal = mrCancel then Abort;
 
     if Checklist.Checked[0] or Checklist.Checked[1] or Checklist.Checked[2] or Checklist.Checked[3] or Checklist.Checked[4] or (CommentsBox.Text <> '') then begin
-      WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
-      WinHttpReq.Open('POST', '{#SurveyUrl}', false);
-      WinHttpReq.Send('{' +
-        ' "version": "{#AppVersion}"' +
-        ', "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
-        ', "checklist": {' +
-          ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
-          ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
-          ', "preferAnotherSyncTool": '+ SerializeBool(Checklist.Checked[2]) +
-          ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
-          ', "other": '+ SerializeBool(Checklist.Checked[4]) +
-        ' }' +
-        ' }');
+      try
+      begin
+        WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
+        WinHttpReq.Open('POST', '{#SurveyUrl}', false);
+        WinHttpReq.Send('{' +
+          ' "version": "{#AppVersion}"' +
+          ', "comment": "' + EscapeJsonString(CommentsBox.Text) + '"' +
+          ', "checklist": {' +
+            ' "wontWork": '+ SerializeBool(Checklist.Checked[0]) + 
+            ', "notWhatINeed": '+ SerializeBool(Checklist.Checked[1]) +
+            ', "preferAnotherSyncTool": '+ SerializeBool(Checklist.Checked[2]) +
+            ', "dontLikeSyncTrayzor": '+ SerializeBool(Checklist.Checked[3]) +
+            ', "other": '+ SerializeBool(Checklist.Checked[4]) +
+          ' }' +
+          ' }');
+      end except
+      end;
     end;
 
     // Restore the standard page payout

diff --git a/server/version_check.php b/server/version_check.php
@@ -65,7 +65,7 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
-   '1.1.17' => [
+   '1.1.18' => [
       'installed' => [
          'direct_download_url' => [
             'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/SyncTrayzorSetup-x64.exe',
@@ -86,6 +86,7 @@ function get_with_wildcard($src, $value, $default = null)
 ];
 
 $upgrades = [
+   '1.1.17' => ['to' => 'latest', 'formatter' => '5', 'overrides' => ['release_notes' => "- Fix uninstaller crash if the survey is submitted while not connected to the internet"]],
    '1.1.16' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.15' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.14' => ['to' => 'latest', 'formatter' => '5'],