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

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 72f2c158740201b51365bdbb1965e28446e8c4af (commit)
       from 09b7748d189468bebd5b48950b9d6ee4cac0f93d (commit)

commit 72f2c158740201b51365bdbb1965e28446e8c4af
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 d322995..2ea18f1 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))