From decf64b86c437303f2cec6a3a4b009d2f9448974 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@codeweavers.com>
Date: Thu, 10 Dec 2009 12:19:49 -0600
Subject: [PATCH] wineboot: Do not force --kill when --end-session is set.

The --kill switch ends processes from all desktops, but --end-session only
applies to the current desktop. This causes windows from other desktops to
dangerously close without notification that the session is ending.
---
 programs/wineboot/wineboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 2587ef58ce5..60a51b704ff 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -956,7 +956,7 @@ int main( int argc, char *argv[] )
     {
         switch(optc)
         {
-        case 'e': end_session = kill = 1; break;
+        case 'e': end_session = 1; break;
         case 'f': force = 1; break;
         case 'i': init = 1; break;
         case 'k': kill = 1; break;