File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2119,19 +2119,28 @@ YUP_API void YUP_CALLTYPE shutdownYup_Windowing()
21192119 {
21202120 SDL_DelEventWatch (displayEventDispatcher, desktop);
21212121 YUP_MODULE_DBG (GUI_WINDOWING , " SDL2: unregistered display event watch" );
2122+
21222123 desktop->deleteInstance ();
21232124 YUP_MODULE_DBG (GUI_WINDOWING , " SDL2: deleted desktop instance" );
21242125 }
21252126
2127+ auto messageManager = MessageManager::getInstanceWithoutCreating ();
2128+
21262129 // Unregister theme
2130+ if (messageManager == nullptr )
2131+ {
2132+ ApplicationTheme::setGlobalTheme (nullptr );
2133+ }
2134+ else
21272135 {
21282136 const MessageManagerLock mmLock;
21292137 ApplicationTheme::setGlobalTheme (nullptr );
2130- YUP_MODULE_DBG (GUI_WINDOWING , " SDL2: unregistered default theme" );
21312138 }
21322139
2140+ YUP_MODULE_DBG (GUI_WINDOWING , " SDL2: unregistered default theme" );
2141+
21332142 // Unregister event loop
2134- if (auto messageManager = MessageManager::getInstanceWithoutCreating () )
2143+ if (messageManager != nullptr )
21352144 {
21362145 messageManager->registerEventLoopCallback (nullptr );
21372146 YUP_MODULE_DBG (GUI_WINDOWING , " SDL2: unregistered event loop callback" );
You can’t perform that action at this time.
0 commit comments