Fix UI

Author: Mysticial

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

@@ -146,12 +146,12 @@ void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_t
 
     switch (interface_type){
     case ControllerInterface::SerialPABotBase:
-        m_selector = new SerialPABotBase::SerialPABotBase_SelectorWidget(*this, nullptr);
+        m_selector = new SerialPABotBase::SerialPABotBase_SelectorWidget(*this, m_session.descriptor().get());
         m_dropdowns->insertWidget(1, m_selector);
         break;
 
     case ControllerInterface::TcpSysbotBase:
-        m_selector = new SysbotBase::TcpSysbotBase_SelectorWidget(*this, nullptr);
+        m_selector = new SysbotBase::TcpSysbotBase_SelectorWidget(*this, m_session.descriptor().get());
         m_dropdowns->insertWidget(1, m_selector);
         break;
 

SerialPrograms/Source/Controllers/ControllerSession.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "ControllerTypeStrings.h"
 #include "ControllerSession.h"
 
 //#include <iostream>

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_SelectorWidget.h

@@ -34,7 +34,11 @@ class SerialPABotBase_SelectorWidget : public NoWheelComboBox{
     {
 //        cout << "SerialPABotBase(): " << current << endl;
 
-        if (current == nullptr){
+        if (current == nullptr || (
+                current->interface_type != ControllerInterface::None &&
+                current->interface_type != ControllerInterface::SerialPABotBase
+            )
+        ){
             std::shared_ptr<const ControllerDescriptor> descriptor =
                 parent.session().option().get_descriptor_from_cache(ControllerInterface::SerialPABotBase);
             if (!descriptor){

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h

@@ -37,7 +37,7 @@ class TcpSysbotBase_SelectorWidget : public QLineEdit{
 
         this->setPlaceholderText("192.168.0.100:6000");
 
-        if (current == nullptr){
+        if (current == nullptr || current->interface_type != ControllerInterface::TcpSysbotBase){
             std::shared_ptr<const ControllerDescriptor> descriptor =
                 parent.session().option().get_descriptor_from_cache(ControllerInterface::TcpSysbotBase);
             if (!descriptor){