nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca183993a5 - Show all commits

8
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@ -957,7 +957,7 @@ struct GWL_Display {
* Needed because #GHOST_System::dispatchEvents fires timers * Needed because #GHOST_System::dispatchEvents fires timers
* outside of WAYLAND (without locking the `timer_mutex`). * outside of WAYLAND (without locking the `timer_mutex`).
*/ */
GHOST_TimerManager *ghost_timer_manager; GHOST_TimerManager *ghost_timer_manager = nullptr;
#endif /* USE_EVENT_BACKGROUND_THREAD */ #endif /* USE_EVENT_BACKGROUND_THREAD */
}; };
@ -1014,8 +1014,10 @@ static void gwl_display_destroy(GWL_Display *display)
} }
/* Important to remove after the seats which may have key repeat timers active. */ /* Important to remove after the seats which may have key repeat timers active. */
delete display->ghost_timer_manager; if (display->ghost_timer_manager) {
display->ghost_timer_manager = nullptr; delete display->ghost_timer_manager;
display->ghost_timer_manager = nullptr;
}
#endif /* USE_EVENT_BACKGROUND_THREAD */ #endif /* USE_EVENT_BACKGROUND_THREAD */