Filter small video modes earlier

Author: Flamefire

libs/s25main/desktops/dskOptions.cpp

@@ -766,8 +766,6 @@ void dskOptions::loadVideoModes()
 {
     // Get available modes
     videoModes_ = VIDEODRIVER.ListVideoModes();
-    // Remove everything below 800x600
-    helpers::erase_if(videoModes_, [](const auto& it) { return it.width < 800 && it.height < 600; });
     // Sort by aspect ratio
     std::sort(videoModes_.begin(), videoModes_.end(), cmpVideoModes);
     windowSizes_ = VIDEODRIVER.GetDefaultWindowSizes();

libs/s25main/drivers/VideoDriverWrapper.cpp

@@ -433,7 +433,10 @@ std::vector<VideoMode> VideoDriverWrapper::ListVideoModes() const
     if(!videodriver)
         return {};
 
-    return videodriver->ListVideoModes();
+    auto videoModes = videodriver->ListVideoModes();
+    // Remove everything below 800x600
+    helpers::erase_if(videoModes, [](const auto& m) { return m.width < 800 && m.height < 600; });
+    return videoModes;
 }
 
 std::vector<VideoMode> VideoDriverWrapper::GetDefaultWindowSizes() const

libs/s25main/ingameWindows/iwSettings.cpp

@@ -78,8 +78,6 @@ iwSettings::iwSettings()
       ->setChecked(!SETTINGS.video.displayMode.resizeable);
 
     supportedResolutions_ = VIDEODRIVER.ListVideoModes();
-    // Remove everything below 800x600
-    helpers::erase_if(supportedResolutions_, [](const auto& it) { return it.width < 800 && it.height < 600; });
     for(const auto& videoMode : supportedResolutions_)
     {
         cbResolution->AddItem(helpers::format("%ux%u", videoMode.width, videoMode.height));