mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	deal with failing pa_runtime_path()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2475 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									dd662d5c57
								
							
						
					
					
						commit
						29c7ded9da
					
				
					 1 changed files with 7 additions and 3 deletions
				
			
		| 
						 | 
					@ -103,7 +103,9 @@ static void unlock_autospawn_lock_file(pa_context *c) {
 | 
				
			||||||
    if (c->autospawn_lock_fd >= 0) {
 | 
					    if (c->autospawn_lock_fd >= 0) {
 | 
				
			||||||
        char *lf;
 | 
					        char *lf;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        lf = pa_runtime_path(AUTOSPAWN_LOCK);
 | 
					        if (!(lf = pa_runtime_path(AUTOSPAWN_LOCK)))
 | 
				
			||||||
 | 
					            pa_log_warn("Cannot unlock autospawn because runtime path is no more.");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pa_unlock_lockfile(lf, c->autospawn_lock_fd);
 | 
					        pa_unlock_lockfile(lf, c->autospawn_lock_fd);
 | 
				
			||||||
        pa_xfree(lf);
 | 
					        pa_xfree(lf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -819,8 +821,10 @@ int pa_context_connect(
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* The per-user instance */
 | 
					        /* The per-user instance */
 | 
				
			||||||
        c->server_list = pa_strlist_prepend(c->server_list, ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET));
 | 
					        if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) {
 | 
				
			||||||
        pa_xfree(ufn);
 | 
					            c->server_list = pa_strlist_prepend(c->server_list, ufn);
 | 
				
			||||||
 | 
					            pa_xfree(ufn);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* Wrap the connection attempts in a single transaction for sane autospawn locking */
 | 
					        /* Wrap the connection attempts in a single transaction for sane autospawn locking */
 | 
				
			||||||
        if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) {
 | 
					        if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue