Appear fast for IE

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
@@ skipping 241 matching lines @@
       m_webBrowser2 = unknownSite;
     }
     s_criticalSectionBrowser.Unlock();
 
     //register the mimefilter
     //and only mimefilter
     //on some few computers the mimefilter does not get properly registered when it is done on another thread
 
     s_criticalSectionLocal.Lock();
     {
-      if (settings->GetPluginEnabled())
-      {
-        s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
-      }
-
+      // We always register on startup and then check if we should do that in a seperate thread  

[Felix Dahlke, 2013/08/07 09:34:49]

I didn't immediately get this, how about:

// Always register on startup, then check if we need to unregister in a separate
thread

+      s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
       s_asyncWebBrowser2 = unknownSite;
       s_instances.Add(this);
     }
     s_criticalSectionLocal.Unlock();
 
     try
     {
       // Check if loaded as BHO
       if (GetBrowser())
       {
@@ skipping 448 matching lines @@
 
     // do nothing
     break;
   }
 
   return VARIANT_TRUE;
 }
 
 bool CPluginClass::InitObject(bool bBHO)
 {
+  CPluginSettings* settings = CPluginSettings::GetInstance();
+
+  // Unregister, if disabled

[Felix Dahlke, 2013/08/07 09:34:49]

This comment is kinda redundant, I think.

+  if (!settings->GetPluginEnabled())
+  {
+    s_mimeFilter->Unregister();
+  }
+
   // Load theme module
-
-
   s_criticalSectionLocal.Lock();
   {
     if (!s_hUxtheme)
     {
       s_hUxtheme = ::GetModuleHandle(_T("uxtheme.dll"));
       if (s_hUxtheme)
       {
         pfnClose = (CLOSETHEMEDATA)::GetProcAddress(s_hUxtheme, "CloseThemeData");
         if (!pfnClose)
         {
@@ skipping 63 matching lines @@
 
   if (CPluginClient::GetInstance()->IsFirstRun())
   {   
     CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL);
     if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled()))
     {
       ShowStatusBar();
     }
 
   }
-
-  CPluginSettings* settings = CPluginSettings::GetInstance();
   return true;
 }
 
 bool CPluginClass::CreateStatusBarPane()
 {
   DEBUG_GENERAL(L"Getting client");
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   DEBUG_GENERAL(L"Getting ieversion");
@@ skipping 1076 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }