mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Merge pull request #194 from sce/ignore_no_startup_id
Ignore exec switch "--no-startup-id".
This commit is contained in:
		
						commit
						ee9b9414b9
					
				
					 1 changed files with 14 additions and 1 deletions
				
			
		| 
						 | 
					@ -186,8 +186,21 @@ static enum cmd_status cmd_exec_always(int argc, char **argv) {
 | 
				
			||||||
	if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) {
 | 
						if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) {
 | 
				
			||||||
		return CMD_FAILURE;
 | 
							return CMD_FAILURE;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						char *tmp = NULL;
 | 
				
			||||||
 | 
						if (strcmp((char*)*argv, "--no-startup-id") == 0) {
 | 
				
			||||||
 | 
							sway_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored.");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							if (!checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0)) {
 | 
				
			||||||
 | 
								return CMD_FAILURE;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							tmp = join_args(argv + 1, argc - 1);
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							tmp = join_args(argv, argc);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Put argument into cmd array
 | 
						// Put argument into cmd array
 | 
				
			||||||
	char *tmp = join_args(argv, argc);
 | 
					 | 
				
			||||||
	char cmd[4096];
 | 
						char cmd[4096];
 | 
				
			||||||
	strcpy(cmd, tmp);
 | 
						strcpy(cmd, tmp);
 | 
				
			||||||
	free(tmp);
 | 
						free(tmp);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue