mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Merge pull request #2852 from RyanDwyer/back-and-forth-crash
Fix crash when using workspace back_and_forth with no previous
This commit is contained in:
		
						commit
						18a2646c1d
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		| 
						 | 
					@ -142,7 +142,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 | 
				
			||||||
				strcasecmp(argv[0], "current") == 0) {
 | 
									strcasecmp(argv[0], "current") == 0) {
 | 
				
			||||||
			ws = workspace_by_name(argv[0]);
 | 
								ws = workspace_by_name(argv[0]);
 | 
				
			||||||
		} else if (strcasecmp(argv[0], "back_and_forth") == 0) {
 | 
							} else if (strcasecmp(argv[0], "back_and_forth") == 0) {
 | 
				
			||||||
			if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) {
 | 
								if (!prev_workspace_name) {
 | 
				
			||||||
 | 
									return cmd_results_new(CMD_INVALID, "workspace",
 | 
				
			||||||
 | 
											"There is no previous workspace");
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								if (!(ws = workspace_by_name(argv[0]))) {
 | 
				
			||||||
				ws = workspace_create(NULL, prev_workspace_name);
 | 
									ws = workspace_create(NULL, prev_workspace_name);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		} else {
 | 
							} else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue