Fix MaxFileSize check

Author: zenden2k

Source/Core/Upload/Filters/SizeExceedFilter.cpp

@@ -1,25 +1,32 @@
-#include "SizeExceedFilter.h"
+#include "SizeExceedFilter.h"
 
 #include "Gui/Dialogs/SizeExceed.h"
 #include "Core/Upload/UploadEngine.h"
 #include "Core/Upload/FileUploadTask.h"
 #include "Core/Upload/UploadSession.h"
 #include "Core/ServiceLocator.h"
 #include "Core/Scripting/DialogProvider.h"
+#include "Core/Settings/WtlGuiSettings.h"
 
 SizeExceedFilter::SizeExceedFilter(CUploadEngineList* engineList, UploadEngineManager* uploadEngineManager) {
     engineList_ = engineList;
     uploadEngineManager_ = uploadEngineManager;
 }
 
 bool SizeExceedFilter::PreUpload(UploadTask* task) {
+    auto settings = ServiceLocator::instance()->settings<WtlGuiSettings>();
+
+    if (!settings->CheckFileTypesBeforeUpload) {
+        return true;
+    }
+
     if (task->type() == UploadTask::TypeFile) {
         FileUploadTask * fileTask = dynamic_cast<FileUploadTask*>(task);
         if (!fileTask || !fileTask->session()) {
             return true;
         }
         CUploadEngineData* ue = fileTask->serverProfile().uploadEngineData();
-        if (ue && ue->MaxFileSize && fileTask->getFileSize() > ue->MaxFileSize) {
+        if (ue && ue->MaxFileSize > 0 && fileTask->getFileSize() > ue->MaxFileSize) {
             std::lock_guard<std::mutex> g(uploadSessionDataMapMutex_);
             auto it = uploadSessionDataMap_.find(fileTask->session());
             if (it != uploadSessionDataMap_.end() && !it->second.newImageServer.isNull()) {
@@ -53,4 +60,4 @@ bool SizeExceedFilter::PostUpload(UploadTask* task) {
 
 void SizeExceedFilter::onSessionFinished(UploadSession* session) {
     uploadSessionDataMap_.erase(session);
-}
+}

Source/Gui/Dialogs/ServerListPopup.cpp

@@ -372,6 +372,8 @@ int CServerListPopup::showPopup(HWND parent, const RECT& anchorRect) {
                 msg.hwnd = queryEditControl_;
                 queryEditControl_.SetFocus();
             }
+            break;
+            
         case WM_KEYDOWN:
         case WM_KEYUP:
             if (msg.hwnd == queryEditControl_ && (msg.wParam == VK_UP || msg.wParam == VK_DOWN)) {