installer/src/custom-action/close_application.cpp - Issue 6219169376763904: Issue #1686 - Kill iexplore.exe and AdblockplusEngine.exe processes from the installer

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: installer/src/custom-action/close_application.cpp

Issue 6219169376763904: Issue #1686 - Kill iexplore.exe and AdblockplusEngine.exe processes from the installer (Closed)

Patch Set: Log error Created April 13, 2015, 4:43 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: installer/src/custom-action/close_application.cpp

===================================================================

--- a/installer/src/custom-action/close_application.cpp

+++ b/installer/src/custom-action/close_application.cpp

@@ -41,15 +41,15 @@

return browserCloser.IsRunning() || engineCloser.IsRunning() ;

}

- bool ShutDown()

+ bool ShutDown(ImmediateSession& session)

{

- if ( browserCloser.IsRunning() && ! browserCloser.ShutDown() )

+ if ( browserCloser.IsRunning() && ! browserCloser.ShutDown(session) )

{

// Assert IE is still running

// This is after we've tried to shut it down, so we fail

return false ;

}

- if ( engineCloser.IsRunning() && ! engineCloser.ShutDown() )

+ if ( engineCloser.IsRunning() && ! engineCloser.ShutDown(session) )

{

// Assert the engine is still running

// This is after IE has shut down itself and after we've tried to shut down the engine. Whatever.

@@ -372,7 +372,7 @@

* Failed && not interactive -> Goto abort

{

- bool ieWasClosed = iec.ShutDown() ;

+ bool ieWasClosed = iec.ShutDown(session) ;

if ( iec.IsRunning() )

{

session.Log( "Attempt to shut down IE automatically failed." ) ;