diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-28 08:46:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-28 08:46:09 +0300 |
| commit | d4daecb223613e6ab3bf1005da65be58af1d6c13 (patch) | |
| tree | 0ab7607235591367baa99383bc9b0176d930b121 /source/blender/windowmanager | |
| parent | 9a4544762e13cbaabce26f9d3cbb16c6ccbf1d3e (diff) | |
| parent | 2a39fb13451336cda609594fbee4d034c068bd22 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 77e17ad4687..454239e5cf0 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -275,6 +275,11 @@ void WM_check(bContext *C) return; } + /* Run before loading the keyconfig. */ + if (wm->message_bus == NULL) { + wm->message_bus = WM_msgbus_create(); + } + if (!G.background) { /* case: fileread */ if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { @@ -286,10 +291,6 @@ void WM_check(bContext *C) wm_window_ghostwindows_ensure(wm); } - if (wm->message_bus == NULL) { - wm->message_bus = WM_msgbus_create(); - } - /* case: fileread */ /* note: this runs in bg mode to set the screen context cb */ if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { |