Fix use-after-delete with fast clocks

tatokis · Jun 18, 2020 · 281ea7f · 281ea7f
1 parent 086c6ea
commit 281ea7f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -476,6 +476,8 @@ void MainWindow::registerUpdate(TrnEmu::Register r, TrnEmu::OperationType t, qui
                 pcarrowpos = 0;
                 break;
             }
+            // Stop any animations if we are about to delete the PC
+            animator->cancelIfInUse(ui->memoryTable->item(val, 0));
             // Set it to the new PC position
             ui->memoryTable->setItem(val, 0, arrow);
             // Update the "pointer"

diff --git a/tablewidgetitemanimator.cpp b/tablewidgetitemanimator.cpp
@@ -110,3 +110,17 @@ TableWidgetItemAnimator::~TableWidgetItemAnimator()
     if(labelbg)
         delete labelbg;
 }
+
+void TableWidgetItemAnimator::cancelIfInUse(QTableWidgetItem* itm)
+{
+    if(itm == readItemThird)
+    {
+        readAnim->stop();
+        readItemThird = readItemSecond = readItemFirst = nullptr;
+    }
+    else if(itm == writeItemThird)
+    {
+        writeAnim->stop();
+        writeItemThird = writeItemSecond = writeItemFirst = nullptr;
+    }
+}
diff --git a/tablewidgetitemanimator.h b/tablewidgetitemanimator.h
@@ -27,8 +27,8 @@ class TableWidgetItemAnimator : public QObject
     void setWriteColour(const QColor& c);
     // Apparently the getters can just be stubs
     inline QColor getColour() { return QColor(); }
-
     ~TableWidgetItemAnimator();
+    void cancelIfInUse(QTableWidgetItem* itm);
 
 signals: