Merge remote-tracking branch 'origin/master' into usb-bochs

Cacodemon345 · May 24, 2024 · 84fd737 · 84fd737
2 parents 69edcc2 + 4526a99
commit 84fd737
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/pci.c b/src/pci.c
@@ -204,15 +204,20 @@ pci_irq(uint8_t slot, uint8_t pci_int, int level, int set, uint8_t *irq_state)
                 }
             }
             break;
-        case (PCI_IIRQ_BASE | 0x00) ... (PCI_IIRQ_BASE | PCI_IIRQ_MAX):
+        case (PCI_IIRQ_BASE | 0x00) ... (PCI_IIRQ_BASE | PCI_IIRQS_NUM):
             /* PCI internal routing. */
-            slot = (slot - 1) & PCI_INT_PINS_MAX;
+            if (slot > 0x00) {
+                slot = (slot - 1) & PCI_INT_PINS_MAX;
 
-            irq_line    = pci_irqs[slot];
+                irq_line    = pci_irqs[slot];
 
-            /* Ignore what was provided to us as a parameter and override it with whatever
-               the chipset is set to. */
-            level       = !!pci_irq_level[slot];
+                /* Ignore what was provided to us as a parameter and override it with whatever
+                   the chipset is set to. */
+                level       = !!pci_irq_level[slot];
+            } else {
+                irq_line    = 0xff;
+                level       = 0;
+            }
             break;
         case (PCI_MIRQ_BASE | 0x00) ... (PCI_MIRQ_BASE | PCI_MIRQ_MAX):
             /* MIRQ */

diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
@@ -223,8 +223,8 @@ main(int argc, char *argv[])
     if(!util::compareUuid()) {
         QMessageBox movewarnbox;
         movewarnbox.setIcon(QMessageBox::Icon::Warning);
-        movewarnbox.setText("This machine might have been moved or copied.");
-        movewarnbox.setInformativeText("In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure.");
+        movewarnbox.setText(QObject::tr("This machine might have been moved or copied."));
+        movewarnbox.setInformativeText(QObject::tr("In order to ensure proper networking functionality, 86Box needs to know if this machine was moved or copied.\n\nSelect \"I Copied It\" if you are not sure."));
         const QPushButton *movedButton  = movewarnbox.addButton(QObject::tr("I Moved It"), QMessageBox::AcceptRole);
         const QPushButton *copiedButton = movewarnbox.addButton(QObject::tr("I Copied It"), QMessageBox::DestructiveRole);
         QPushButton       *cancelButton = movewarnbox.addButton(QObject::tr("Cancel"), QMessageBox::RejectRole);