[Xfce4-commits] <xfce4-session:xfce-4.8> Fix --fast CLI option when used with another option (bug #7197).

[Jérôme Guelfucci]

Updating branch refs/heads/xfce-4.8
         to 959a69ba29f8b0fa50719161006be604dd93f606 (commit)
       from e7809b1bbaee7b88404843667cd611c583854331 (commit)

commit 959a69ba29f8b0fa50719161006be604dd93f606
Author: Krzysiek <krzysiek.bmkx at gmail.com>
Date:   Wed Feb 2 17:33:21 2011 +0100

    Fix --fast CLI option when used with another option (bug #7197).

 xfce4-session-logout/main.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index 5ae3314..705fad5 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -154,10 +154,6 @@ main (int argc, char **argv)
     {
       shutdown_type = XFSM_SHUTDOWN_HIBERNATE;
     }
-  else if (opt_fast)
-    {
-      allow_save = FALSE;
-    }
   else if (opt_version)
     {
       printf ("%s (Xfce %s)\n\n"
@@ -170,6 +166,11 @@ main (int argc, char **argv)
       return EXIT_SUCCESS;
     }
 
+  if (opt_fast)
+    {
+      allow_save = FALSE;
+    }
+
   dbus_error_init (&derror);
   dbus_conn = dbus_bus_get (DBUS_BUS_SESSION, &derror);
   if (G_UNLIKELY (dbus_conn == NULL))