]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
dbus: do not emit signals when the main thread finished early
authorJaroslav Kysela <perex@perex.cz>
Mon, 11 Aug 2014 16:31:06 +0000 (18:31 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 11 Aug 2014 16:31:06 +0000 (18:31 +0200)
src/dbus.c

index c5eaf3b583f9c6ada9f7dfddceb98af3b310af18..3f1eb2eff9d34621dcf8a0e3d1df58905600882a 100644 (file)
@@ -351,11 +351,14 @@ dbus_server_thread(void *aux)
   uint8_t         c;
 
   conn = dbus_create_session("org.tvheadend.server");
-  if (conn == NULL)
+  if (conn == NULL) {
+    dbus_running = 0;
     return NULL;
+  }
 
   notify = dbus_create_session("org.tvheadend.notify");
   if (notify == NULL) {
+    dbus_running = 0;
     dbus_connection_safe_close(conn);
     return NULL;
   }
@@ -368,6 +371,7 @@ dbus_server_thread(void *aux)
   tvhpoll_add(poll, &ev, 1);
   memset(&ev, 0, sizeof(ev));
   if (!dbus_connection_get_unix_fd(conn, &ev.fd)) {
+    dbus_running = 0;
     tvhpoll_destroy(poll);
     dbus_connection_safe_close(notify);
     dbus_connection_safe_close(conn);