Merge pull request #8678 from liamwhite/stop-waiting

video_core: stop waiting for shader compilation on user cancel
2022-07-31 14:47:43 -07:00 · 2022-07-31 14:47:43 -07:00 · 5ae0e5ba67
commit 5ae0e5ba67
parent 3bbc1cf64c fc013d88cb
2 changed files with 2 additions and 2 deletions
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@ -299,7 +299,7 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading,
    state.has_loaded = true;
    lock.unlock();

-    workers->WaitForRequests();
+    workers->WaitForRequests(stop_loading);
    if (!use_asynchronous_shaders) {
        workers.reset();
    }