Unified Diff: installer/src/custom-action/close_application.cpp
Issue 5024350814076928:
Issue 1103 - Migrate Simple Adblock users
Patch Set: Make it less Simple Adblock specific, and add the FRP changes
Created April 16, 2015, 9:52 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« html/static/js/ieFirstRun.js ('K')
|
« html/templates/firstRun.html ('k')
|
installer/src/msi/adblockplusie.wxs » ('j')
|
src/plugin/PluginClass.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: installer/src/custom-action/close_application.cpp |
| =================================================================== |
| --- a/installer/src/custom-action/close_application.cpp |
| +++ b/installer/src/custom-action/close_application.cpp |
| @@ -206,12 +206,12 @@ |
| */ |
| std::wstring uilevel = Property( session, L"UILevel" ) ; |
| bool interactive ; |
| - if ( uilevel == L"5" || uilevel == L"4" ) |
| + if ( uilevel == L"5" || uilevel == L"4" || uilevel == L"3") |
| { |
| interactive = true ; |
| // Assert state is one of { notKnown, allow, passive, active, automatic } |
| } |
| - else if ( uilevel == L"3" || uilevel == L"2" ) |
| + else if (uilevel == L"2") |
|
sergei
2015/04/22 10:37:09
it seems not a part of this issue.
Oleksandr
2015/04/24 11:50:32
Yes, this is part of http://codereview.adblockplus
sergei
2015/04/28 14:41:15
So, do you mind commit it separately?
sergei
2015/07/28 11:11:54
So, it's still here, is it essential for this issu
|
| { |
| // Assert installer is running without user interaction. |
| interactive = false ; |
« html/static/js/ieFirstRun.js ('K')
|
« html/templates/firstRun.html ('k')
|
installer/src/msi/adblockplusie.wxs » ('j')
|
src/plugin/PluginClass.cpp » ('J')
