[pulseaudio-commits] r2498 - /trunk/src/pulse/client-conf.c

[svnmailer-noreply at 0pointer.de]

Author: coling
Date: Mon Jun  9 20:21:56 2008
New Revision: 2498

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2498&root=pulseaudio&view=rev
Log:
Do not invalidate the cookie if no file was specified.
Only invalidate it when a cookie-file is specified and it is not loaded/parsed correctly.
This fixes a bug introduced in r2494

Modified:
    trunk/src/pulse/client-conf.c

Modified: trunk/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.c?rev=2498&root=pulseaudio&r1=2497&r2=2498&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.c (original)
+++ trunk/src/pulse/client-conf.c Mon Jun  9 20:21:56 2008
@@ -178,10 +178,10 @@
 int pa_client_conf_load_cookie(pa_client_conf* c) {
     pa_assert(c);
 
-    c->cookie_valid = FALSE;
-
     if (!c->cookie_file)
         return -1;
+
+    c->cookie_valid = FALSE;
 
     if (pa_authkey_load_auto(c->cookie_file, c->cookie, sizeof(c->cookie)) < 0)
         return -1;