summarylogtreecommitdiffstats
path: root/python-finalize-before-viewer-reset.patch
blob: d0510487b3c6ed36ddf0eb7eee04962e104f1b22 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -303,12 +303,13 @@
 
             mcp_http.stop();
 
+            python::finalize();
+
             viewer.reset();
 
             core::Tensor::shutdown_memory_pool();
             core::PinnedMemoryAllocator::instance().shutdown();
 
-            python::finalize();
             std::_Exit(0);
         }
 
--- a/src/visualizer/gui/gui_manager.cpp
+++ b/src/visualizer/gui/gui_manager.cpp
@@ -801,8 +801,10 @@
             lfs::python::acquire_gil_main_thread();
 
         lfs::python::shutdown_python_gl_resources();
+        lfs::python::set_modal_enqueue_callback({});
 
         global_context_menu_->destroyGLResources();
+        rml_modal_overlay_.reset();
         rml_status_bar_.shutdown();
         rml_menu_bar_.shutdown();
         rml_viewport_overlay_.shutdown();