tracker3: Don't create connection in static constructor

bus_new will wait for work in the GDBus thread to be completed. However,
further type initialization in the GDBus thread will block on the GType
class_init_rec_mutex we're already holding and we end up in a deadlock.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/tracker3/rygel-tracker-root-container.vala b/src/plugins/tracker3/rygel-tracker-root-container.vala
index c5d3b25a..c7f722a8 100644
--- a/src/plugins/tracker3/rygel-tracker-root-container.vala
+++ b/src/plugins/tracker3/rygel-tracker-root-container.vala
@@ -34,15 +34,15 @@ public class Rygel.Tracker.RootContainer : Rygel.SimpleContainer {
 
     public static Sparql.Connection connection;
 
-    static construct {
-        try {
-            RootContainer.connection = Sparql.Connection.bus_new (TRACKER_SERVICE, null);
-        } catch (Error err) {
-            error ("Failed to connect to tracker: %s", err.message);
+    public RootContainer (string title) {
+        if (RootContainer.connection == null) {
+            try {
+                RootContainer.connection = Sparql.Connection.bus_new (TRACKER_SERVICE, null);
+            } catch (Error err) {
+                error ("Failed to connect to tracker: %s", err.message);
+            }
         }
-    }
 
-    public RootContainer (string title) {
         base.root (title);
 
         if (this.get_bool_config_without_error ("share-music")) {