Fix crash when updating of combo row

Use value from the option string list, not from the combo row to find the index to select. The combo row strings are the user-facing names for the values.

Author: patrickfournier

src/DeviceOptionsState.cpp

@@ -595,7 +595,7 @@ void Gorfector::DeviceOptionsState::Updater::ApplyPreset(const nlohmann::json &j
     FindRequestMismatches(indicesToApply, mismatchIndices);
     if (!mismatchIndices.empty())
     {
-        g_warning("Failed to set all requested values on the device after %d iterations.", 20 - maxRepeatCount);
+        g_print("Failed to set all requested values on the device after %d iterations.", 20 - maxRepeatCount);
     }
 }
 

src/DeviceOptionsState.hpp

@@ -24,7 +24,10 @@ namespace Gorfector
 
     union WidgetIndex
     {
-        const uint32_t OptionValueIndices[2];
+        const uint32_t OptionValueIndices[2]; /*
+                                               * First index is the option index,
+                                               * second index is the value index within the option.
+                                               */
         const uint64_t CompositeIndex;
     };
 

src/DeviceSelectorState.hpp

@@ -33,8 +33,6 @@ namespace Gorfector
          *
          * This method clears the current device list, reinitializes the SANE library, and fetches the latest
          * list of devices. It also ensures that the previously selected device is reselected if it is still available.
-         *
-         * \throws std::runtime_error If the SANE library fails to initialize.
          */
         void GetDevicesFromSANE()
         {

src/OptionRewriter.hpp

@@ -140,7 +140,7 @@ namespace Gorfector
         }
 
         /**
-         * \brief Retrieves a rewritten string list for an option.
+         * \brief Retrieves a rewritten, translated string list for an option.
          * \param optionIndex The index of the option.
          * \param defaultList The default string list to use if no custom list is found.
          * \param rewrittenStringList The output parameter to store the rewritten string list.

src/ScanOptionsPanel.cpp

@@ -1147,9 +1147,15 @@ void Gorfector::ScanOptionsPanel::Update(const std::vector<uint64_t> &lastSeenVe
     {
         for (auto changedIndex: changeset->GetChangedIndices())
         {
+            auto widget = m_Widgets[changedIndex.CompositeIndex];
+
+            if (widget == nullptr)
+            {
+                continue;
+            }
+
             auto option = m_DeviceOptions->GetOption(changedIndex.OptionValueIndices[0]);
             auto settingValueType = option->GetValueType();
-            auto widget = m_Widgets[changedIndex.CompositeIndex];
 
             switch (settingValueType)
             {
@@ -1209,20 +1215,27 @@ void Gorfector::ScanOptionsPanel::Update(const std::vector<uint64_t> &lastSeenVe
 
                     if (ADW_IS_COMBO_ROW(widget))
                     {
-                        auto items = adw_combo_row_get_model(ADW_COMBO_ROW(widget));
-                        uint32_t valuePosition = 0;
-                        for (uint32_t i = 0; i < g_list_model_get_n_items(items); i++)
+                        auto stringList = option->GetStringList();
+                        auto valuePosition = 0;
+                        while (stringList[valuePosition] != nullptr)
                         {
-                            auto *item = G_OBJECT(g_list_model_get_item(items, i));
-                            auto itemName = gtk_string_object_get_string(GTK_STRING_OBJECT(item));
-                            if (strcmp(itemName, value.c_str()) == 0)
+                            auto optionValue = stringList[valuePosition];
+
+                            if (strcmp(optionValue, value.c_str()) == 0)
                             {
-                                valuePosition = i;
                                 break;
                             }
+                            valuePosition++;
                         }
 
-                        adw_combo_row_set_selected(ADW_COMBO_ROW(widget), valuePosition);
+                        if (stringList[valuePosition] == nullptr)
+                        {
+                            g_print("Value %s not found in combo row %s\n", value.c_str(), G_OBJECT_TYPE_NAME(widget));
+                        }
+                        else
+                        {
+                            adw_combo_row_set_selected(ADW_COMBO_ROW(widget), valuePosition);
+                        }
                     }
                     else if (ADW_IS_ENTRY_ROW(widget))
                     {