mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-03 16:46:18 +00:00 
			
		
		
		
	Check for already locked/suspended clients in server_lock_client rather than
its callers.
This commit is contained in:
		@@ -164,8 +164,6 @@ server_lock(void)
 | 
			
		||||
		c = ARRAY_ITEM(&clients, i);
 | 
			
		||||
		if (c == NULL || c->session == NULL)
 | 
			
		||||
			continue;
 | 
			
		||||
		if (c->flags & CLIENT_SUSPENDED)
 | 
			
		||||
			continue;
 | 
			
		||||
		server_lock_client(c);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -180,8 +178,6 @@ server_lock_session(struct session *s)
 | 
			
		||||
		c = ARRAY_ITEM(&clients, i);
 | 
			
		||||
		if (c == NULL || c->session == NULL || c->session != s)
 | 
			
		||||
			continue;
 | 
			
		||||
		if (c->flags & CLIENT_SUSPENDED)
 | 
			
		||||
			continue;
 | 
			
		||||
		server_lock_client(c);
 | 
			
		||||
	}	
 | 
			
		||||
}
 | 
			
		||||
@@ -193,6 +189,9 @@ server_lock_client(struct client *c)
 | 
			
		||||
	size_t			 cmdlen;
 | 
			
		||||
	struct msg_lock_data	 lockdata;
 | 
			
		||||
 | 
			
		||||
	if (c->flags & CLIENT_SUSPENDED)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	cmd = options_get_string(&c->session->options, "lock-command");
 | 
			
		||||
	cmdlen = strlcpy(lockdata.cmd, cmd, sizeof lockdata.cmd);
 | 
			
		||||
	if (cmdlen >= sizeof lockdata.cmd)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user