Threading shenanigans

include/panda_qt/main_window.hpp

@@ -5,6 +5,7 @@
 #include <QtWidgets>
 #include <atomic>
 #include <filesystem>
+#include <functional>
 #include <mutex>
 #include <thread>
 #include <vector>

src/panda_qt/cheats_window.cpp

@@ -9,6 +9,8 @@
 #include <QPushButton>
 #include <QTextEdit>
 #include <QVBoxLayout>
+#include <QTimer>
+#include <functional>
 
 #include "cheats.hpp"
 #include "emulator.hpp"
@@ -23,6 +25,19 @@ struct CheatMetadata {
 	bool enabled = true;
 };
 
+void dispatchToMainThread(std::function<void()> callback)
+{
+    QTimer* timer = new QTimer();
+    timer->moveToThread(qApp->thread());
+    timer->setSingleShot(true);
+    QObject::connect(timer, &QTimer::timeout, [=]()
+    {
+        callback();
+        timer->deleteLater();
+    });
+    QMetaObject::invokeMethod(timer, "start", Qt::QueuedConnection, Q_ARG(int, 0));
+}
+
 class CheatEntryWidget : public QWidget {
   public:
 	CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListWidget* parent);
@@ -181,16 +196,22 @@ void CheatEditDialog::accepted() {
 	}
 
 	mainWindow->editCheat(cheatEntry.GetMetadata().handle, bytes, [this](u32 handle) {
-		CheatMetadata metadata = cheatEntry.GetMetadata();
+        dispatchToMainThread([this, handle]() {
-		metadata.handle = handle;
+            if (handle == badCheatHandle) {
-		cheatEntry.SetMetadata(metadata);
+                cheatEntry.Remove();
-		cheatEntry.Update();
+                return;
+            } else {
+                CheatMetadata metadata = cheatEntry.GetMetadata();
+                metadata.handle = handle;
+                cheatEntry.SetMetadata(metadata);
+                cheatEntry.Update();
+            }
+        });
 	});
 }
 
 void CheatEditDialog::rejected() {
 	bool isEditing = cheatEntry.GetMetadata().handle != badCheatHandle;
-
 	if (!isEditing) {
 		// Was adding a cheat but pressed cancel
 		cheatEntry.Remove();