blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use assertions instead of guard.

This commit is contained in:
Connor E 2019-01-14 16:05:24 +00:00
parent e7fff4f560
commit b1cdd2b4b3
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/xdg_shell/wlr_xdg_surface.c
View File

@ -518,18 +518,16 @@ void wlr_xdg_surface_ping(struct wlr_xdg_surface *surface) {
} }
void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface) { void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface) {
if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL assert(surface->toplevel);
&& surface->toplevel) { assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
xdg_toplevel_send_close(surface->toplevel->resource); xdg_toplevel_send_close(surface->toplevel->resource);
} }
}
void wlr_xdg_popup_destroy(struct wlr_xdg_surface *surface) { void wlr_xdg_popup_destroy(struct wlr_xdg_surface *surface) {
if (surface->role == WLR_XDG_SURFACE_ROLE_POPUP assert(surface->popup);
&& surface->popup) { assert(surface->role == WLR_XDG_SURFACE_ROLE_POPUP);
xdg_popup_send_popup_done(surface->popup->resource); xdg_popup_send_popup_done(surface->popup->resource);
} }
}
static void xdg_popup_get_position(struct wlr_xdg_popup *popup, static void xdg_popup_get_position(struct wlr_xdg_popup *popup,
double *popup_sx, double *popup_sy) { double *popup_sx, double *popup_sy) {