[Bf-blender-cvs] [2a39fb13451] blender-v2.82-release: Fix T68960: Crash loading app-template keymap

[Campbell Barton]

Commit: 2a39fb13451336cda609594fbee4d034c068bd22
Author: Campbell Barton
Date:   Tue Jan 28 16:44:24 2020 +1100
Branches: blender-v2.82-release
https://developer.blender.org/rB2a39fb13451336cda609594fbee4d034c068bd22

Fix T68960: Crash loading app-template keymap

===================================================================

M	source/blender/windowmanager/intern/wm.c

===================================================================

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) {