[ros-diffs] [cfinck] 27702: Readd the removed line from the patch and add more information about the Usage of the "-f" option (see comment #6 of bug #2379) The "-f" option now works like in Windows: If you did not specify any other parameter, it will also log off from the current session.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Tue Jul 17 01:50:50 2007
New Revision: 27702

URL: http://svn.reactos.org/svn/reactos?rev=27702&view=rev
Log:
Readd the removed line from the patch and add more information about the Usage of the "-f" option (see comment #6 of bug #2379)
The "-f" option now works like in Windows: If you did not specify any other parameter, it will also log off from the current session.

Modified:
    trunk/reactos/base/applications/shutdown/shutdown.c

Modified: trunk/reactos/base/applications/shutdown/shutdown.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown/shutdown.c?rev=27702&r1=27701&r2=27702&view=diff
==============================================================================
--- trunk/reactos/base/applications/shutdown/shutdown.c (original)
+++ trunk/reactos/base/applications/shutdown/shutdown.c Tue Jul 17 01:50:50 2007
@@ -19,6 +19,8 @@
 	_tprintf(_T("\n  -s\t\t\tShutdown the computer"));
 	_tprintf(_T("\n  -r\t\t\tShutdown and restart the computer"));
 	_tprintf(_T("\n  -f\t\t\tForces running applications to close without warnings"));
+	_tprintf(_T("\n    \t\t\tIf you did not specify any other parameter, this option"));
+	_tprintf(_T("\n    \t\t\twill also log off"));
 	_tprintf(_T("\n"));
 }
 
@@ -96,7 +98,13 @@
 	
 	// Sets additional flags
 	if (opts.force)
+	{
 		exitOpts.flags = exitOpts.flags | EWX_FORCE;
+
+		// This makes sure that we log off, also if there is only the "-f" option specified.
+		// The Windows shutdown utility does it the same way.
+		exitOpts.shouldExit = TRUE;
+	}
 	
 	// Reason for shutdown
 	// Hardcoded to "Other (Planned)"