Exe updater support and bug fixes

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 215 matching lines @@
                 {
                     isNewFilterVersion = true;
                 }
 #endif // SUPPORT_FILTER
 
                 settings->Write();
                 
                 configuration->Invalidate();
 
 #ifdef SUPPORT_FILTER
+                                 DEBUG_GENERAL("*** before isNewFilterVersion");
+
                 // Update filters, if needed (5 days * (random() * 0.4 + 0.8))
                 if (isNewFilterVersion)
                 {
 
+                                         DEBUG_GENERAL("*** before CheckFilterAndDownload");
                                         settings->CheckFilterAndDownload();
 
                                         settings->MakeRequestForUpdate();
 
 
                                         settings->Write();
 
                                         tab->OnUpdate();
                 }
 #endif // SUPPORT_FILTER
                     }
         }
 
 
 #ifndef ENTERPRISE
             // --------------------------------------------------------------------
             // Update plugin
             // --------------------------------------------------------------------
 
         if (!IsMainThreadDone(hMainThread) && s_isPluginToBeUpdated)
         {
             DEBUG_GENERAL(L"*** Displaying download plugin dialog");
 
             s_isPluginToBeUpdated = false;
 
             try
             {
                 CString updateUrl = settings->GetString(SETTING_PLUGIN_UPDATE_URL);
-                        CString updatePath = CPluginSettings::GetTempPath(INSTALL_MSI_FILE);
-
-                                // Delete old installer
-                                ::DeleteFile(CPluginSettings::GetTempPath(INSTALL_MSI_FILE));
+                                CString updatePath = L"";
+                                if (updateUrl.Find(L".exe") == updateUrl.GetLength() - 4)
+                                {
+                                updatePath = CPluginSettings::GetTempPath(INSTALL_EXE_FILE);
+                                        // Delete old installer
+                                        ::DeleteFile(CPluginSettings::GetTempPath(INSTALL_EXE_FILE));
+                                }
+                                else
+                                {
+                                updatePath = CPluginSettings::GetTempPath(INSTALL_MSI_FILE);
+                                        // Delete old installer
+                                        ::DeleteFile(CPluginSettings::GetTempPath(INSTALL_MSI_FILE));
+                                }
 
                         CPluginDownloadDialog dlDlg;
                         
                         dlDlg.SetUrlAndPath(updateUrl, updatePath);
                         if (dlDlg.DoModal(::GetDesktopWindow()) == IDC_INSTALLBTN)
                         {
                                 LaunchUpdater(updatePath);
 #ifdef AUTOMATIC_SHUTDOWN
                                         settings->EraseTab();
                                 ::ExitProcess(0);
@@ skipping 54 matching lines @@
     bool isDone = false;
 
     s_criticalSectionLocal.Lock();
     {
         isDone = s_isMainThreadDone || mainThread != s_hMainThread;
     }
     s_criticalSectionLocal.Unlock();
 
     return isDone;
 }