Fix controller interface dropdown broken for sbb.

Author: Mysticial

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

@@ -49,12 +49,16 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
     interface_dropdown = new NoWheelCompactComboBox(this);
     m_dropdowns->addWidget(interface_dropdown);
 
-    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::SerialPABotBase)));
+    m_interface_list.emplace_back(ControllerInterface::SerialPABotBase);
     if (PreloadSettings::instance().DEVELOPER_MODE){
-        interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::SerialPABotBase2)));
+        m_interface_list.emplace_back(ControllerInterface::SerialPABotBase2);
+    }
+    m_interface_list.emplace_back(ControllerInterface::TcpSysbotBase);
+//    m_interface_list.emplace_back(ControllerInterface::UsbSysbotBase);
+
+    for (ControllerInterface item : m_interface_list){
+        interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item)));
     }
-    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::TcpSysbotBase)));
-//    interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(ControllerInterface::UsbSysbotBase)));
 
 //    interface_dropdown->setHidden(true);
 
@@ -107,7 +111,7 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
             index = std::max(index, 0);
 //            index = std::min(index, (int)m_device_list.size() - 1);
 
-            ControllerInterface incoming = (ControllerInterface)(index + 1);
+            ControllerInterface incoming = m_interface_list[index];
             ControllerInterface existing = m_session.descriptor()->interface_type;
 //            cout << "incoming = " << (int)incoming << endl;
 //            cout << "existing = " << (int)existing << endl;
@@ -152,7 +156,12 @@ void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_t
     if (interface_type == ControllerInterface::None){
         interface_type = ControllerInterface::SerialPABotBase;
     }
-    interface_dropdown->setCurrentIndex((int)interface_type - 1);
+    for (size_t index = 0; index < m_interface_list.size(); index++){
+        if (interface_type == m_interface_list[index]){
+            interface_dropdown->setCurrentIndex((int)index);
+            break;
+        }
+    }
 
     delete m_selector;
     m_selector = nullptr;

SerialPrograms/Source/Controllers/ControllerSelectorWidget.h

@@ -67,6 +67,7 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List
     QPushButton* m_reset_button = nullptr;
 
 //    bool m_shift_held = false;
+    std::vector<ControllerInterface> m_interface_list;
 
     std::vector<std::shared_ptr<const ControllerDescriptor>> m_device_list;
 };