Join only keyboard and joy mix slots - AntiMicroX#93

However that's debatable
Gallxz · Apr 8, 2020 · 09c8427 · 09c8427
1 parent 77c03c3
commit 09c8427
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/advancebuttondialog.cpp b/src/advancebuttondialog.cpp
@@ -561,7 +561,7 @@ void AdvanceButtonDialog::joinSlot()
     }
     else if (anySelectedNotKeybSlot())
     {
-        QMessageBox::warning(this, tr("Only keyboard slots"), tr("It's only possible to join simple keyboard slots"));
+        QMessageBox::warning(this, tr("Only keyboard slots"), tr("It's only possible to join simple and mix keyboard slots"));
     }
     else
     {
@@ -1580,7 +1580,9 @@ bool AdvanceButtonDialog::anySelectedNotKeybSlot()
 {
     for(auto item : ui->slotListWidget->selectedItems())
     {
-        if (item->data(Qt::UserRole).value<SimpleKeyGrabberButton*>()->getValue()->getSlotMode() != JoyButtonSlot::JoySlotInputAction::JoyKeyboard)
+        auto slotMode = item->data(Qt::UserRole).value<SimpleKeyGrabberButton*>()->getValue()->getSlotMode();
+
+        if ((slotMode != JoyButtonSlot::JoySlotInputAction::JoyMix) && (slotMode != JoyButtonSlot::JoySlotInputAction::JoyKeyboard))
         {
             return true;
         }