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

Unified Diff: src/plugin/PluginClass.cpp

Issue 11364147: Fix for IE6 FRP crash (Closed)
Patch Set: Created Aug. 11, 2013, 6:04 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« html/templates/firstRun.html ('K') | « html/templates/firstRun.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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
Felix Dahlke 2013/08/11 11:23:12 So you mean we cannot create threads in IE? If so,
Oleksandr 2013/08/11 16:26:53 What I mean is that IE6 COM object can not be cont
Felix Dahlke 2013/08/11 16:58:18 No, I think the current one nails it then.
+ if (CPluginClient::GetInstance()->GetIEVersion() < 7)
+ {
+ FirstRunThread();
+ }
+ else
+ {
+ CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL);
+ }
if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled()))
{
ShowStatusBar();
« html/templates/firstRun.html ('K') | « html/templates/firstRun.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld