diff libaudacious/beepctrl.c @ 1444:c04ce16b2b57 trunk

[svn] - libaudacious/beepctrl.c: optimise further and be more paranoid about leaks - audacious/main.c, main.h: add `session_uri_base' key. - audacious/controlsocket.c: TCP session code (no security yet, thus no public option)

--- a/libaudacious/beepctrl.c	Fri Jul 28 01:11:15 2006 -0700
+++ b/libaudacious/beepctrl.c	Fri Jul 28 01:31:44 2006 -0700
@@ -309,13 +309,13 @@
     ConfigDb *db;
     gchar *value = NULL;
 
-    db = bmp_cfg_db_open();
-
     if (audacious_session_uri != NULL)
     {
 	return audacious_session_uri;
     }
 
+    db = bmp_cfg_db_open();
+
     bmp_cfg_db_get_string(db, NULL, "session_uri_base", &value);
 
     bmp_cfg_db_close(db);
@@ -324,6 +324,8 @@
         return g_strdup_printf("unix://localhost/%s/%s_%s.%d", g_get_tmp_dir(),
 		CTRLSOCKET_NAME, g_get_user_name(), session);
 
+    audacious_session_uri = value;
+
     return value;
 }