diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-17 17:30:44 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-17 17:30:44 +0200 |
commit | a9114c602b0bb2df3ee598721df9d8cf4041745b (patch) | |
tree | 7ad4c45d421540e30f834c1808d58b86a1ceee98 /editor | |
parent | 00d44a9c7381e02ca89e2e2675f518c3c60a65f8 (diff) | |
parent | 9efb2e786e266cdba9be87d3ca473c5e178ca1ae (diff) |
Merge pull request #67441 from Zylann/fix_tileset_editor_mutex
Fix case where mutex is never unlocked
Diffstat (limited to 'editor')
-rw-r--r-- | editor/plugins/tiles/tiles_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/plugins/tiles/tiles_editor_plugin.cpp index 364c3b7246..6fdc9a80e8 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.cpp +++ b/editor/plugins/tiles/tiles_editor_plugin.cpp @@ -66,7 +66,9 @@ void TilesEditorPlugin::_thread() { pattern_preview_sem.wait(); pattern_preview_mutex.lock(); - if (pattern_preview_queue.size()) { + if (pattern_preview_queue.size() == 0) { + pattern_preview_mutex.unlock(); + } else { QueueItem item = pattern_preview_queue.front()->get(); pattern_preview_queue.pop_front(); pattern_preview_mutex.unlock(); @@ -130,8 +132,6 @@ void TilesEditorPlugin::_thread() { item.callback.callp(args_ptr, 2, r, error); viewport->queue_delete(); - } else { - pattern_preview_mutex.unlock(); } } } |