summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/core-util.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
commit0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2 (patch)
tree42c290cd1f1c05c687d8134e40b63244d4fba4e9 /src/pulsecore/core-util.c
parent0e096632c53b746b9f4b4c0249d9e5a18c1c543d (diff)
parent8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/modules/module-stream-restore.c
Diffstat (limited to 'src/pulsecore/core-util.c')
-rw-r--r--src/pulsecore/core-util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 63751f53..d576d01d 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1877,17 +1877,17 @@ char *pa_make_path_absolute(const char *p) {
static char *get_path(const char *fn, pa_bool_t prependmid, pa_bool_t rt) {
char *rtp;
- if (pa_is_path_absolute(fn))
- return pa_xstrdup(fn);
-
rtp = rt ? pa_get_runtime_dir() : pa_get_state_dir();
- if (!rtp)
- return NULL;
-
if (fn) {
char *r;
+ if (pa_is_path_absolute(fn))
+ return pa_xstrdup(fn);
+
+ if (!rtp)
+ return NULL;
+
if (prependmid) {
char *mid;