aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-06-27 17:54:57 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-06-27 17:54:57 +1000
commite6829c5991cac1bd164f800c14fccd522d702783 (patch)
tree74f48c0c81cfa64bd480195bddc47ada10812cc4 /sway/desktop
parent8773ed39701748ba5500b4698d028795aa6e812e (diff)
downloadsway-e6829c5991cac1bd164f800c14fccd522d702783.tar.xz
Move unsetting of view->surface into view_unmap
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/xdg_shell.c1
-rw-r--r--sway/desktop/xdg_shell_v6.c1
-rw-r--r--sway/desktop/xwayland.c2
3 files changed, 0 insertions, 4 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index b6fa9525..b076d772 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -201,7 +201,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
wl_list_remove(&xdg_shell_view->commit.link);
wl_list_remove(&xdg_shell_view->new_popup.link);
- view->surface = NULL;
}
static void handle_map(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 6042a806..7320e629 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -200,7 +200,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
wl_list_remove(&xdg_shell_v6_view->commit.link);
wl_list_remove(&xdg_shell_v6_view->new_popup.link);
- view->surface = NULL;
}
static void handle_map(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 1d5dab70..854da006 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -263,7 +263,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
view_unmap(view);
wl_list_remove(&xwayland_view->commit.link);
- view->surface = NULL;
}
static void handle_map(struct wl_listener *listener, void *data) {
@@ -301,7 +300,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
if (view->surface) {
view_unmap(view);
wl_list_remove(&xwayland_view->commit.link);
- view->surface = NULL;
}
wl_list_remove(&xwayland_view->destroy.link);