summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nautilus-application.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index f5e32b0d6..bde2330d9 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -826,10 +826,14 @@ nautilus_application_command_line (GApplication *application,
g_action_group_activate_action (G_ACTION_GROUP (application),
"open-desktop", NULL);
} else if (g_variant_dict_contains (options, "no-desktop")) {
- DEBUG ("Forcing desktop off, as requested");
- self->priv->desktop_override = TRUE;
- g_action_group_activate_action (G_ACTION_GROUP (application),
- "close-desktop", NULL);
+ if (g_application_get_is_remote (application)) {
+ DEBUG ("Not primary instance. Ignoring --no-desktop.");
+ } else {
+ DEBUG ("Forcing desktop off, as requested");
+ self->priv->desktop_override = TRUE;
+ g_action_group_activate_action (G_ACTION_GROUP (application),
+ "close-desktop", NULL);
+ }
}
if (g_variant_dict_contains (options, "no-default-window")) {