ui: Fix starting Rygel after enabling DLNA

diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala
index 970deef..184e456 100644 (file)
--- a/src/ui/rygel-preferences-dialog.vala
+++ b/src/ui/rygel-preferences-dialog.vala
@@ -69,6 +69,7 @@ public class Rygel.PreferencesDialog : GLib.Object {
 
     public void run () {
         this.dialog.run ();
+        this.dialog.hide ();
 
         this.config.set_upnp_enabled (this.upnp_check.active);
         foreach (var section in this.sections) {

diff --git a/src/ui/rygel-writable-user-config.vala b/src/ui/rygel-writable-user-config.vala
index cec92a6..ab5b01f 100644 (file)
--- a/src/ui/rygel-writable-user-config.vala
+++ b/src/ui/rygel-writable-user-config.vala
@@ -176,10 +176,15 @@ public class Rygel.WritableUserConfig : Rygel.UserConfig {
             var dest = this.get_autostart_file ();
 
             if (enable) {
+                var loop = new MainLoop (null, false);
                 // Creating the proxy starts the service
                 Bus.watch_name (BusType.SESSION,
                                 DBusInterface.SERVICE_NAME,
-                                BusNameWatcherFlags.AUTO_START);
+                                BusNameWatcherFlags.AUTO_START,
+                                () => { loop.quit (); },
+                                () => { loop.quit (); });
+
+                loop.run ();
 
                 // Then symlink the desktop file to user's autostart dir
                 var source_path = Path.build_filename (BuildConfig.DESKTOP_DIR,