diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-05-21 22:44:37 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-05-21 22:44:37 +0000 |
| commit | 29c7ded9daa61af2a7f8367760af53081eb1301a (patch) | |
| tree | c812c0b1403bc8f870b1e45b609c3223cf2441c8 | |
| parent | dd662d5c57afd3419157194d758df44c7f6fe5d6 (diff) | |
deal with failing pa_runtime_path()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2475 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/pulse/context.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index 0780e2f3..2d92320f 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -103,7 +103,9 @@ static void unlock_autospawn_lock_file(pa_context *c) { if (c->autospawn_lock_fd >= 0) { 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_xfree(lf); @@ -819,8 +821,10 @@ int pa_context_connect( } /* The per-user instance */ - c->server_list = pa_strlist_prepend(c->server_list, ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET)); - pa_xfree(ufn); + if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) { + 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 */ if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) { |