Skip to content

Commit 877339b

Browse files
committed
Hopefull disable install/uninstall ping and disable survey
1 parent bf47134 commit 877339b

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

browser/installer/windows/nsis/installer.nsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2109,5 +2109,4 @@ FunctionEnd
21092109

21102110
Function .onGUIEnd
21112111
${OnEndCommon}
2112-
Call SendPing
21132112
FunctionEnd

browser/installer/windows/nsis/uninstaller.nsi

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@ UninstPage custom un.preConfirm
200200
!insertmacro MUI_UNPAGE_INSTFILES
201201

202202
; Finish Page
203-
!define MUI_FINISHPAGE_SHOWREADME
204-
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
205-
!define MUI_FINISHPAGE_SHOWREADME_TEXT $(UN_SURVEY_CHECKBOX_LABEL)
206-
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.Survey
207203
!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preFinish
208204
!define MUI_PAGE_CUSTOMFUNCTION_SHOW un.showFinish
209205
!insertmacro MUI_UNPAGE_FINISH
@@ -214,15 +210,6 @@ ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe"
214210
################################################################################
215211
# Helper Functions
216212

217-
Function un.Survey
218-
; We can't actually call ExecInExplorer here because it's going to have to
219-
; make some marshalled COM calls and those are not allowed from within a
220-
; synchronous message handler (where we currently are); we'll be thrown
221-
; RPC_E_CANTCALLOUT_ININPUTSYNCCALL if we try. So all we can do is record
222-
; that we need to make the call later, which we'll do from un.onGUIEnd.
223-
StrCpy $ShouldOpenSurvey "1"
224-
FunctionEnd
225-
226213
; This function is used to uninstall the maintenance service if the
227214
; application currently being uninstalled is the last application to use the
228215
; maintenance service.
@@ -974,7 +961,7 @@ FunctionEnd
974961

975962
Function un.onUninstSuccess
976963
; Send a ping at un.onGUIEnd, to avoid freezing the GUI.
977-
StrCpy $ShouldSendPing "1"
964+
StrCpy $ShouldSendPing "0"
978965

979966
${If} ${Silent}
980967
; If this is a silent uninstall then un.onGUIEnd doesn't run, so do it now.

0 commit comments

Comments
 (0)