ui/video-presets: Fix referencing nullptr when no video preset loaded

leikareipa · Nov 11, 2023 · 53d3be2 · 53d3be2
1 parent c35f09b
commit 53d3be2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/common/globals.h b/src/common/globals.h
@@ -15,7 +15,7 @@ const struct semantic_version_s
 {
     unsigned major = 3;
     unsigned minor = 4;
-    unsigned patch = 0;
+    unsigned patch = 1;
 } VCS_VERSION;
 
 // The minimum and maximum resolution we can output frames in.

diff --git a/src/display/qt/windows/ControlPanel/VideoPresets.cpp b/src/display/qt/windows/ControlPanel/VideoPresets.cpp
@@ -450,9 +450,15 @@ control_panel::VideoPresets::VideoPresets(QWidget *parent) :
             ui->parameterGrid_properties->clear();
             for (const char* propName: kc_supported_video_preset_properties())
             {
+                const int currentValue = (
+                    (ui->comboBox_presetList->current_preset() && ui->comboBox_presetList->current_preset()->properties.contains(propName))
+                        ? ui->comboBox_presetList->current_preset()->properties[propName]
+                        : kc_device_property(std::string(propName) + ": default")
+                );
+
                 ui->parameterGrid_properties->add_scroller(
                     propName,
-                    ui->comboBox_presetList->current_preset()->properties[propName],
+                    currentValue,
                     kc_device_property(std::string(propName) + ": minimum"),
                     kc_device_property(std::string(propName) + ": maximum")
                 );