Fix a few issues

Mostly copy past errors and an nullptr error.
AntiMicroX · Apr 30, 2022 · 212be93 · 212be93
1 parent b7363d4
commit 212be93
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/gui/joytabwidget.cpp b/src/gui/joytabwidget.cpp
@@ -2040,7 +2040,7 @@ void JoyTabWidget::fillSetButtons(SetJoystick *set)
             {
                 connect(sensorButtonGroup,
                     &SensorPushButtonGroup::buttonSlotChanged, this,
-                    &JoyTabWidget::checkStickEmptyDisplay);
+                    &JoyTabWidget::checkSensorEmptyDisplay);
             }
 
             connect(namesPushButton, &QPushButton::clicked, sensorButtonGroup,

diff --git a/src/joysensorpreset.cpp b/src/joysensorpreset.cpp
@@ -233,7 +233,7 @@ void JoySensorPreset::setSensorPreset(Preset preset)
     {
     case PRESET_NONE:
         QMetaObject::invokeMethod(&m_helper, "clearButtonsSlotsEventReset");
-        QMetaObject::invokeMethod(m_sensor, "setDiagonalRange", Q_ARG(int, 45));
+        QMetaObject::invokeMethod(m_sensor, "setDiagonalRange", Q_ARG(float, 45));
         break;
     case PRESET_MOUSE:
         PadderCommon::inputDaemonMutex.lock();

diff --git a/src/sensorpushbuttongroup.cpp b/src/sensorpushbuttongroup.cpp
@@ -49,6 +49,8 @@ void SensorPushButtonGroup::generateButtons()
 
     if (m_sensor->getType() == GYROSCOPE)
         m_bwd_button = generateBtnToGrid(SENSOR_BWD, 2, 0);
+    else
+        m_bwd_button = nullptr;
 
     m_sensor_widget = new JoySensorPushButton(m_sensor, m_display_names, parentWidget());
     m_sensor_widget->setIcon(
@@ -75,13 +77,15 @@ SensorPushButtonGroup::generateBtnToGrid(
 
     button->establishPropertyUpdatedConnections();
     connect(button, &JoySensorButton::slotsChanged, this,
-        &SensorPushButtonGroup::propogateSlotsChanged);
+        &SensorPushButtonGroup::propagateSlotsChanged);
 
     addWidget(pushbutton, gridRow, gridCol);
     return pushbutton;
 }
 
-void SensorPushButtonGroup::propogateSlotsChanged() { emit buttonSlotChanged(); }
+void SensorPushButtonGroup::propagateSlotsChanged() {
+    emit buttonSlotChanged();
+}
 
 JoySensor *SensorPushButtonGroup::getSensor() const { return m_sensor; }
 
@@ -109,7 +113,8 @@ void SensorPushButtonGroup::toggleNameDisplay()
     m_left_button->toggleNameDisplay();
     m_right_button->toggleNameDisplay();
     m_fwd_button->toggleNameDisplay();
-    m_bwd_button->toggleNameDisplay();
+    if (m_bwd_button != nullptr)
+        m_bwd_button->toggleNameDisplay();
 
     m_sensor_widget->toggleNameDisplay();
 }

diff --git a/src/sensorpushbuttongroup.h b/src/sensorpushbuttongroup.h
@@ -46,7 +46,7 @@ class SensorPushButtonGroup : public QGridLayout
     void toggleNameDisplay();
 
   private slots:
-    void propogateSlotsChanged();
+    void propagateSlotsChanged();
     void openSensorButtonDialog(JoySensorButtonPushButton *pushbutton);
     void showSensorDialog();