Unified Diff: src/plugin/PluginClass.cpp
Issue 11364147:
Fix for IE6 FRP crash (Closed)
Patch Set: Comment addressed
Created Aug. 11, 2013, 4:21 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« html/static/js/ieFirstRun.js ('k')
|
no next file »
|
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 |
| @@ -813,7 +813,15 @@ |
| if (CPluginClient::GetInstance()->IsFirstRun()) |
| { |
| - CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL); |
| + // IE6 can't be accessed from another thread, execute in current thread |
| + if (CPluginClient::GetInstance()->GetIEVersion() < 7) |
| + { |
| + FirstRunThread(); |
| + } |
| + else |
| + { |
| + CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL); |
| + } |
| if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled())) |
| { |
| ShowStatusBar(); |
« no previous file with comments
|
« html/static/js/ieFirstRun.js ('k')
|
no next file »
|
no next file with comments »
