[Bf-blender-cvs] [870bb404a0c] temp-lanpr-staging: Fix T68705: Changing any editor to the properties crashes Blender

[Dalai Felinto]

Commit: 870bb404a0c6813470c1f9f8fcaf436b9b970060
Author: Dalai Felinto
Date:   Thu Aug 15 16:38:31 2019 -0300
Branches: temp-lanpr-staging
https://developer.blender.org/rB870bb404a0c6813470c1f9f8fcaf436b9b970060

Fix T68705: Changing any editor to the properties crashes Blender

Issue introduced (more like exposed) in b7f86ff72273.

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

M	source/blender/editors/space_buttons/buttons_context.c

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

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 2a28dc56607..2e4c51e8802 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -821,11 +821,11 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
   SpaceProperties *sbuts = CTX_wm_space_properties(C);
   ButsContextPath *path = sbuts ? sbuts->path : NULL;
 
-  if (sbuts->mainb == BCONTEXT_TOOL) {
+  if (!path) {
     return 0;
   }
 
-  if (!path) {
+  if (sbuts->mainb == BCONTEXT_TOOL) {
     return 0;
   }