mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Fix crash closing fullscreen windows in container
This commit is contained in:
		
							parent
							
								
									67f9b7fe5b
								
							
						
					
					
						commit
						b16dbf6d64
					
				
					 1 changed files with 11 additions and 4 deletions
				
			
		| 
						 | 
					@ -554,10 +554,6 @@ static void handle_view_destroyed(wlc_handle handle) {
 | 
				
			||||||
		remove_view_from_scratchpad(view);
 | 
							remove_view_from_scratchpad(view);
 | 
				
			||||||
		swayc_t *parent = destroy_view(view);
 | 
							swayc_t *parent = destroy_view(view);
 | 
				
			||||||
		if (parent) {
 | 
							if (parent) {
 | 
				
			||||||
			if (fullscreen) {
 | 
					 | 
				
			||||||
				parent->fullscreen = NULL;
 | 
					 | 
				
			||||||
			}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
			ipc_event_window(parent, "close");
 | 
								ipc_event_window(parent, "close");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// Destroy empty workspaces
 | 
								// Destroy empty workspaces
 | 
				
			||||||
| 
						 | 
					@ -569,6 +565,17 @@ static void handle_view_destroyed(wlc_handle handle) {
 | 
				
			||||||
				parent = destroy_workspace(parent);
 | 
									parent = destroy_workspace(parent);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								if (fullscreen) {
 | 
				
			||||||
 | 
									while (parent) {
 | 
				
			||||||
 | 
										if (parent->fullscreen) {
 | 
				
			||||||
 | 
											parent->fullscreen = NULL;
 | 
				
			||||||
 | 
											break;
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
 | 
										parent = parent->parent;
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			arrange_windows(parent, -1, -1);
 | 
								arrange_windows(parent, -1, -1);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue