Fix OpenGL shader changed race.

snes9xgit · Aug 25, 2023 · ad613b5 · ad613b5
1 parent 8bb1e77
commit ad613b5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/qt/src/DisplayPanel.cpp b/qt/src/DisplayPanel.cpp
@@ -30,7 +30,7 @@ DisplayPanel::DisplayPanel(EmuApplication *app_)
 
     QObject::connect(checkBox_use_shader, &QCheckBox::clicked, [&](bool checked) {
         app->config->use_shader = checked;
-        app->window->canvas->shaderChanged();
+        app->window->shaderChanged();
     });
 
     QObject::connect(pushButton_browse_shader, &QPushButton::clicked, [&] {
@@ -116,7 +116,7 @@ void DisplayPanel::selectShaderDialog()
     app->config->shader = dialog.selectedFiles().at(0).toUtf8();
     app->config->last_shader_folder = dialog.directory().absolutePath().toStdString();
     lineEdit_shader->setText(app->config->shader.c_str());
-    app->window->canvas->shaderChanged();
+    app->window->shaderChanged();
 }
 
 void DisplayPanel::populateDevices()

diff --git a/qt/src/EmuMainWindow.cpp b/qt/src/EmuMainWindow.cpp
@@ -640,4 +640,12 @@ void EmuMainWindow::recreateUIAssets()
         if (canvas)
             canvas->recreateUIAssets();
     }, true);
+}
+
+void EmuMainWindow::shaderChanged()
+{
+    app->emu_thread->runOnThread([&] {
+        if (canvas)
+            canvas->shaderChanged();
+    });
 }
diff --git a/qt/src/EmuMainWindow.hpp b/qt/src/EmuMainWindow.hpp
@@ -34,6 +34,7 @@ class EmuMainWindow : public QMainWindow
     void openFile();
     bool openFile(std::string filename);
     void recreateUIAssets();
+    void shaderChanged();
     std::vector<std::string> getDisplayDeviceList();
     EmuApplication *app;
     EmuCanvas *canvas;