Unified Diff: src/plugin/PluginClass.cpp
Issue 5024350814076928:
Issue 1103 - Migrate Simple Adblock users
Patch Set: Rebase and cleanup
Created July 13, 2015, 3:44 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« html/static/js/ieFirstRun.js ('K')
|
« installer/src/msi/adblockplusie.wxs ('k')
|
src/plugin/PluginUserSettings.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/plugin/PluginClass.cpp |
| =================================================================== |
| --- a/src/plugin/PluginClass.cpp |
| +++ b/src/plugin/PluginClass.cpp |
| @@ -706,7 +706,7 @@ |
| return false; |
| } |
| s_criticalSectionLocal.Lock(); |
| - std::wstring curVer = CPluginClient::GetInstance()->GetPref(std::wstring(L"currentVersion"), std::wstring(L"0.0")); |
| + std::wstring curVer = CPluginClient::GetInstance()->GetPref(L"currentVersion", L"0.0"); |
| // The plugin version can be "simpleadblock", which doesn't have the "." |
| if (curVer.find(L".") == std::wstring::npos) |
| { |
| @@ -722,7 +722,8 @@ |
| { |
| if (!isFirstRun) |
| { |
| - if (!CPluginClient::GetInstance()->GetPref(curVer, false)) |
| + // Display an update page only if it's not a conversion from other product |
| + if (CPluginClient::GetInstance()->GetPref(L"convertedFrom", L"") == L"") |
| { |
| CPluginClient::GetInstance()->SetPref(L"displayUpdatePage", true); |
| } |
« html/static/js/ieFirstRun.js ('K')
|
« installer/src/msi/adblockplusie.wxs ('k')
|
src/plugin/PluginUserSettings.cpp » ('j')
|
no next file with comments »
