Fix restart loop when started without icons on the desktop

Fix for https://github.com/mate-desktop/caja/issues/686
Also checked in XFCE to make sure unkillable caja process did not return
Note that the combination of no icons on the desktop with exit on last window will still trigger a restart loop just as it always has

1 files changed, 6 insertions, 1 deletions

diff --git a/src/caja-application.c b/src/caja-application.c
index 49958d39..bf8404d9 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -2399,9 +2399,14 @@ caja_application_startup (GApplication *app)
     {
         exit_with_last_window = g_settings_get_boolean (caja_preferences,   
                                 CAJA_PREFERENCES_EXIT_WITH_LAST_WINDOW);
+        /*Keep this inside the running as mate/not as root block */
+        /*So other desktop don't get unkillable caja instances holding open */
+        instance = g_application_get_default ();
+        if (exit_with_last_window == FALSE){
+            g_application_hold (G_APPLICATION (instance));
+        }
     }
 
-    instance = g_application_get_default ();
 }
 
 static void