Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: installer/src/custom-action/close_application.cpp

Issue 6689082285490176: Issue 1598 - The set up was unable to automatically close IE while uninstall
Patch Set: Created March 18, 2015, 1:42 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | installer/src/msi/adblockplusie.wxs » ('j') | installer/src/msi/adblockplusie.wxs » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /** 1 /**
2 * \file close_application.cpp 2 * \file close_application.cpp
3 */ 3 */
4 4
5 #include <algorithm> 5 #include <algorithm>
6 6
7 #include "session.h" 7 #include "session.h"
8 #include "property.h" 8 #include "property.h"
9 #include "database.h" 9 #include "database.h"
10 #include "process.h" 10 #include "process.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 { 215 {
216 // Assert installer is running without user interaction. 216 // Assert installer is running without user interaction.
217 interactive = false ; 217 interactive = false ;
218 if ( state == notKnown ) 218 if ( state == notKnown )
219 { 219 {
220 // Assert AVOIDREBOOT was not specified 220 // Assert AVOIDREBOOT was not specified
221 /* 221 /*
222 * This is where we specify default behavior for non-interactive operati on. 222 * This is where we specify default behavior for non-interactive operati on.
223 * The choice of "allow" makes it act like other installers, which is to make no effort to avoid a reboot after installation. 223 * The choice of "allow" makes it act like other installers, which is to make no effort to avoid a reboot after installation.
224 */ 224 */
225 » state = allow ; 225 » state = notKnown ;
Eric 2015/03/18 16:13:47 Assigning a state that you just checked is not nee
226 » session.Log( "Reboot allowed by default in non-interactive session." ) ; 226 » session.Log( "Reboot NOT allowed by default in non-interactive session." ) ;
227 } 227 }
228 else if ( state == active ) 228 else if ( state == active )
229 { 229 {
230 throw std::runtime_error( "AVOIDREBOOT=ACTIVE in non-interative session is not consistent" ) ; 230 throw std::runtime_error( "AVOIDREBOOT=ACTIVE in non-interative session is not consistent" ) ;
231 } 231 }
232 // Assert state is one of { allow, passive, automatic } 232 // Assert state is one of { allow, passive, automatic }
233 } 233 }
234 else 234 else
235 { 235 {
236 throw std::runtime_error( "unrecognized value for UILevel" ) ; 236 throw std::runtime_error( "unrecognized value for UILevel" ) ;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 return ERROR_INSTALL_FAILURE ; 441 return ERROR_INSTALL_FAILURE ;
442 } 442 }
443 catch( ... ) 443 catch( ... )
444 { 444 {
445 session.LogNoexcept( "terminated by unknown exception" ) ; 445 session.LogNoexcept( "terminated by unknown exception" ) ;
446 return ERROR_INSTALL_FAILURE ; 446 return ERROR_INSTALL_FAILURE ;
447 } 447 }
448 // Should be unreachable. 448 // Should be unreachable.
449 return ERROR_INSTALL_FAILURE ; 449 return ERROR_INSTALL_FAILURE ;
450 } 450 }
OLDNEW
« no previous file with comments | « no previous file | installer/src/msi/adblockplusie.wxs » ('j') | installer/src/msi/adblockplusie.wxs » ('J')

Powered by Google App Engine
This is Rietveld