Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_handlers.c
index 1e31837f08824494d3bbcbb3e4cbc2280a56f891..3af64c8c5a6645539c48a98b4cf5cd23a1f2f5ec 100644 (file)
@@ -7720,7 +7720,9 @@ void UI_but_tooltip_timer_remove(bContext *C, uiBut *but)
                        data->autoopentimer = NULL;
                }
 
-               WM_tooltip_clear(C, data->window);
+               if (data->window) {
+                       WM_tooltip_clear(C, data->window);
+               }
        }
 }