diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-02-26 02:15:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-02-26 02:15:59 +0300 |
| commit | 3cf2821f2f09d3c55dd88c2b6fb3b26e1ff69a7e (patch) | |
| tree | 66ffef104bffcd2490d929c9789fc2cbc11e73ad /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | bda0456933e87c2f623a8e4f980bf7cfc6b3982a (diff) | |
| parent | 5c3216e2334863137019b55a44d5b9cfea842c10 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index fbbde2a6d28..055196a84ab 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -445,8 +445,6 @@ void WM_exit_ext(bContext *C, const bool do_python) { wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL; - BKE_sound_exit(); - /* first wrap up running stuff, we assume only the active WM is running */ /* modal handlers are on window level freed, others too? */ /* note; same code copied in wm_files.c */ @@ -595,6 +593,10 @@ void WM_exit_ext(bContext *C, const bool do_python) BLI_threadapi_exit(); + /* No need to call this early, rather do it late so that other pieces of Blender using sound may exit cleanly, + * see also T50676. */ + BKE_sound_exit(); + BKE_blender_atexit(); if (MEM_get_memory_blocks_in_use() != 0) { |