mirror of
				https://github.com/tmux/tmux.git
				synced 2025-10-26 12:27:15 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		
							
								
								
									
										3
									
								
								spawn.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								spawn.c
									
									
									
									
									
								
							@@ -364,6 +364,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
 | 
			
		||||
			window_remove_pane(w, new_wp);
 | 
			
		||||
		}
 | 
			
		||||
		sigprocmask(SIG_SETMASK, &oldset, NULL);
 | 
			
		||||
		environ_free(child);
 | 
			
		||||
		return (NULL);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -450,6 +451,8 @@ complete:
 | 
			
		||||
	sigprocmask(SIG_SETMASK, &oldset, NULL);
 | 
			
		||||
	window_pane_set_event(new_wp);
 | 
			
		||||
 | 
			
		||||
	environ_free(child);
 | 
			
		||||
 | 
			
		||||
	if (sc->flags & SPAWN_RESPAWN)
 | 
			
		||||
		return (new_wp);
 | 
			
		||||
	if ((~sc->flags & SPAWN_DETACHED) || w->active == NULL) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user