Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: crash when moving tabbed container to scratchpad #182

Merged
merged 1 commit into from
Jun 3, 2023
Merged

fix: crash when moving tabbed container to scratchpad #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions sway/tree/root.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,15 @@ void root_destroy(struct sway_root *root) {

/* Set minimized state from scratchpad container `show` state */
static void root_scratchpad_set_minimize(struct sway_container *con, bool minimize) {
struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = con->view->foreign_toplevel;
if (wlr_surface_is_xwayland_surface(con->view->surface)) {
struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface);
wlr_xwayland_surface_set_minimized(xsurface, minimize);
} else if (foreign_toplevel) {
wlr_foreign_toplevel_handle_v1_set_minimized(foreign_toplevel, minimize);
if (con->view) {
struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = con->view->foreign_toplevel;

if (wlr_surface_is_xwayland_surface(con->view->surface)) {
struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface);
wlr_xwayland_surface_set_minimized(xsurface, minimize);
} else if (foreign_toplevel) {
wlr_foreign_toplevel_handle_v1_set_minimized(foreign_toplevel, minimize);
}
}
}

Expand Down