Merge lp:~gero-bare/switchboard/fix-missing-navigation-bar into lp:~elementary-pantheon/switchboard/switchboard

[Gero.Bare]

Fix missing navigation button introduced in r612

Fix missing navigation button introduced in r612.

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2016-04-10 19:57:21 +0000
+++ src/Switchboard.vala	2016-04-11 20:03:43 +0000
@@ -200,12 +200,6 @@
                 return false;
             });
 
-            // Launch plug's executable
-            navigation_button.set_sensitive (true);
-            navigation_button.set_text (all_settings_label);
-            navigation_button.show ();
-            headerbar.title = plug.display_name;
-            current_plug = plug;
 
             //FIXME lower priority for gcc plugs due crash bug #1528361
             var priority = GLib.Priority.DEFAULT_IDLE;
@@ -214,6 +208,13 @@
             }
 
             Idle.add (()=> {
+                // Launch plug's executable
+                navigation_button.set_sensitive (true);
+                navigation_button.set_text (all_settings_label);
+                navigation_button.show ();
+                headerbar.title = plug.display_name;
+                current_plug = plug;
+
                 switch_to_plug (plug);
                 return false;
             }, priority);
@@ -587,3 +588,4 @@
 _("Center;Control;Panel;Preferences;System;");
 _("About System Settings");
 #endif
+