@ -1153,7 +1153,7 @@ resize_grab_motion(struct weston_pointer_grab *grab,
weston_pointer_move ( pointer , event ) ;
weston_pointer_move ( pointer , event ) ;
if ( ! shsurf )
if ( ! shsurf | | ! shsurf - > desktop_surface )
return ;
return ;
weston_view_from_global_fixed ( shsurf - > view ,
weston_view_from_global_fixed ( shsurf - > view ,
@ -1204,7 +1204,7 @@ resize_grab_button(struct weston_pointer_grab *grab,
if ( pointer - > button_count = = 0 & &
if ( pointer - > button_count = = 0 & &
state = = WL_POINTER_BUTTON_STATE_RELEASED ) {
state = = WL_POINTER_BUTTON_STATE_RELEASED ) {
if ( resize - > base . shsurf ! = NULL ) {
if ( resize - > base . shsurf & & resize - > base . shsurf - > desktop_surface ) {
struct weston_desktop_surface * desktop_surface =
struct weston_desktop_surface * desktop_surface =
resize - > base . shsurf - > desktop_surface ;
resize - > base . shsurf - > desktop_surface ;
weston_desktop_surface_set_resizing ( desktop_surface ,
weston_desktop_surface_set_resizing ( desktop_surface ,
@ -1222,7 +1222,7 @@ resize_grab_cancel(struct weston_pointer_grab *grab)
{
{
struct weston_resize_grab * resize = ( struct weston_resize_grab * ) grab ;
struct weston_resize_grab * resize = ( struct weston_resize_grab * ) grab ;
if ( resize - > base . shsurf ! = NULL ) {
if ( resize - > base . shsurf & & resize - > base . shsurf - > desktop_surface ) {
struct weston_desktop_surface * desktop_surface =
struct weston_desktop_surface * desktop_surface =
resize - > base . shsurf - > desktop_surface ;
resize - > base . shsurf - > desktop_surface ;
weston_desktop_surface_set_resizing ( desktop_surface , false ) ;
weston_desktop_surface_set_resizing ( desktop_surface , false ) ;