diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-24 15:23:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-24 15:23:32 +0300 |
| commit | 39aea50155dc623db48f900d2b9644b607425b6c (patch) | |
| tree | 3bb0411d569ffd9a5963ff05569e57a327784609 /source/blender/windowmanager | |
| parent | c1361d2651222fb52839df038e92c18e1fdefc4e (diff) | |
Fix T55178: Cursor fails to restore on cancel
574c0fe38f332bd97c588029c0075ecba1fe19cd caused complications
restoring the cursor.
Use WM_cursor_modal_set/restore which is intended for operator use,
calling ED_region_cursor_set after an operator runs isn't reliable.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 4f3f8ece1f0..c800370a85d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1958,14 +1958,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand /* remove modal handler, operator itself should have been canceled and freed */ if (retval & (OPERATOR_CANCELLED | OPERATOR_FINISHED)) { - /* set cursor back to the default for the region */ - wmWindow *win = CTX_wm_window(C); - WM_cursor_grab_disable(win, NULL); - /* Causes crash when joining areas: T55166, seems this is not even needed. */ -#if 0 - ED_region_cursor_set(win, area, region); -#endif - + WM_cursor_grab_disable(CTX_wm_window(C), NULL); BLI_remlink(handlers, handler); wm_event_free_handler(handler); |