Merge lp:~artem-anufrij/switchboard/Bugfix-1367206 into lp:~elementary-pantheon/switchboard/switchboard

[Artem Anufrij]

Only allow a single instance of Switchboard (lp:1367206)

Changed switchboard in a singular application

[lp:~artem-anufrij/switchboard/Bugfix-1367206]

518. By artem-anufrij on 2014-11-07

Changed switchboard in a singular application

519. By artem-anufrij on 2014-11-07

Changed switchboard in a singular application

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-11-05 22:00:51 +0000
+++ src/Switchboard.vala	2014-11-07 20:13:38 +0000
@@ -32,7 +32,7 @@
         //       all its widgets are displayed.
         cheese_gtk_init (ref args);
 
-        var app = new SwitchboardApp ();
+        var app = SwitchboardApp.instance;
         return app.run (args);
     }
 
@@ -84,6 +84,16 @@
             about_license_type = Gtk.License.GPL_3_0;
         }
 
+        public static SwitchboardApp _instance = null;
+
+        public static SwitchboardApp instance {
+            get {
+                if (_instance == null)
+                    _instance = new SwitchboardApp ();
+                return _instance;
+            }
+        }
+
         public override int command_line (ApplicationCommandLine command_line) {
             hold ();
             int res = _command_line (command_line);
@@ -125,17 +135,18 @@
                         break;
                     }
                 }
-                // If app is already running, present the current window.
-                if (get_windows () != null) {
-                    get_windows ().data.present ();
-                    return 1;
-                }
 
                 // If plug_to_open was set from the command line
                 should_animate_next_transition = false;
                 opened_directly = true;
             }
 
+            // If app is already running, present the current window.
+            if (get_windows () != null) {
+                get_windows ().data.present ();
+                return 1;
+            }
+
             loaded_plugs = new Gee.LinkedList <string> ();
             Switchboard.PlugsManager.get_default ();
             settings = new GLib.Settings ("org.pantheon.switchboard.saved-state");