Filterlists downloads changes

Shared/PluginClassThread.cpp

 #include "PluginStdAfx.h"
 
 #include <ctime>
 
 #include "PluginClass.h"
 #include "PluginDictionary.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginConfiguration.h"
 #ifdef SUPPORT_FILTER
@@ skipping 13 matching lines @@
 
 #include "ProtocolImpl.h"
 #include "ProtocolCF.h"
 
 HANDLE CPluginClass::s_hMainThread = NULL;
 bool CPluginClass::s_isMainThreadDone = false;
 
 
 DWORD WINAPI CPluginClass::MainThreadProc(LPVOID pParam)
 {
+
         CPluginTab* tab = static_cast<CPluginTab*>(pParam);
 
     // Force loading/creation of settings
     CPluginSettings* settings = CPluginSettings::GetInstance();
 
     CPluginSystem* system = CPluginSystem::GetInstance();
 
     settings->SetMainThreadId();
 
     CString debugText;
@@ skipping 163 matching lines @@
                 bool isNewFilterVersion = false;
 #endif
 #ifdef SUPPORT_CONFIG
                 bool isNewConfig = false;
 #endif
 
                 DEBUG_THREAD("Thread::Update settings (action)");
                 
                 settings->ForceConfigurationUpdateOnStart(false);
 
-                            if (configuration->IsValidPluginUpdate() && configuration->GetPluginUpdateVersion() != IEPLUGIN_VERSION)
-                {
-                    settings->SetString(SETTING_PLUGIN_UPDATE_URL, configuration->GetPluginUpdateUrl());
-                    settings->SetString(SETTING_PLUGIN_UPDATE_VERSION, configuration->GetPluginUpdateVersion());
-                }
-                else
-                            {
-                    settings->Remove(SETTING_PLUGIN_UPDATE_VERSION);
-                    settings->Remove(SETTING_PLUGIN_UPDATE_URL);
-                            }
-
                 if (configuration->IsValidPluginInfoPanel())
                 {
                                     settings->SetValue(SETTING_PLUGIN_INFO_PANEL, configuration->GetPluginInfoPanel());
                             }
                 
 #ifdef SUPPORT_FILTER
                 // Update filter URL list
                 if (configuration->IsValidFilter())
                 {
                     isNewFilterVersion = true;
                 }
 #endif // SUPPORT_FILTER
 
                 settings->Write();
                 
                 configuration->Invalidate();
 
 #ifdef SUPPORT_FILTER
                 // Update filters, if needed (5 days * (random() * 0.4 + 0.8))
                 if (isNewFilterVersion)
                 {
 
                                         settings->CheckFilterAndDownload();
 
                                         settings->MakeRequestForUpdate();
+
+
+                                        settings->Write();
+
                                         tab->OnUpdate();
                 }
 #endif // SUPPORT_FILTER
                     }
         }
 
-            // --------------------------------------------------------------------
-            // Check filters
-            // --------------------------------------------------------------------
-#ifdef SUPPORT_FILTER
-
-        DEBUG_THREAD(L"Thread::Check filters");
-
-        if (!IsMainThreadDone(hMainThread))
-        {
-            if (client->DownloadFirstMissingFilter())
-            {
-                                tab->OnUpdate();
-                        }
-        }
-
-#endif // SUPPORT_FILTER
 
 #ifndef ENTERPRISE
             // --------------------------------------------------------------------
             // Update plugin
             // --------------------------------------------------------------------
 
         if (!IsMainThreadDone(hMainThread) && s_isPluginToBeUpdated)
         {
             DEBUG_GENERAL(L"*** Displaying download plugin dialog");
 
@@ skipping 12 matching lines @@
                         dlDlg.SetUrlAndPath(updateUrl, updatePath);
                         if (dlDlg.DoModal(::GetDesktopWindow()) == IDC_INSTALLBTN)
                         {
                                 LaunchUpdater(updatePath);
 #ifdef AUTOMATIC_SHUTDOWN
                                         settings->EraseTab();
                                 ::ExitProcess(0);
 #endif // AUTOMATIC_SHUTDOWN
                         }
             }
-            catch (std::runtime_error&)
+            catch (std::runtime_error& er)
             {
+                                DEBUG_ERROR(er.what());
             }
         }
 #endif
         // ----------------------------------------------------------------
         // End loop
         // ----------------------------------------------------------------
 
         if (!IsMainThreadDone(hMainThread))
         {
                     bool isDone = false;
@@ skipping 38 matching lines @@
     bool isDone = false;
 
     s_criticalSectionLocal.Lock();
     {
         isDone = s_isMainThreadDone || mainThread != s_hMainThread;
     }
     s_criticalSectionLocal.Unlock();
 
     return isDone;
 }