From 65aab2569d23bb9cc636cb04deb0987596cd5bcd Mon Sep 17 00:00:00 2001
From: Justin DeFields <jdefields@devonit.com>
Date: Mon, 28 Jul 2014 15:24:48 -0400
Subject: [PATCH] Move multimon/span logic from cmdline.c to client.c post
 processing

---
 client/common/client.c  | 13 +++++++++++++
 client/common/cmdline.c |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/client/common/client.c b/client/common/client.c
index 3f2da9a88..35fedb8dc 100644
--- a/client/common/client.c
+++ b/client/common/client.c
@@ -130,6 +130,19 @@ static BOOL freerdp_client_settings_post_process(rdpSettings* settings)
 			}
 		}
 	}
+	
+	/* Moved logic for Multimon and Span monitors to force fullscreen, so
+	 * that the rdp file also triggers this functionality */
+	if (settings->SpanMonitors)
+	{
+		settings->UseMultimon = TRUE;
+		settings->Fullscreen = TRUE;
+	}
+	else if (settings->UseMultimon)
+	{
+		settings->Fullscreen = TRUE;
+	}
+	
 	return TRUE;
 
 out_error:
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index bd8e909f9..480f9f21b 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -1281,8 +1281,6 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
 		CommandLineSwitchCase(arg, "multimon")
 		{
 			settings->UseMultimon = TRUE;
-			settings->SpanMonitors = FALSE;
-			settings->Fullscreen = TRUE;
 
 			if (arg->Flags & COMMAND_LINE_VALUE_PRESENT)
 			{
@@ -1294,9 +1292,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
 		}
 		CommandLineSwitchCase(arg, "span")
 		{
-			settings->UseMultimon = TRUE;
 			settings->SpanMonitors = TRUE;
-			settings->Fullscreen = TRUE;
 		}
 		CommandLineSwitchCase(arg, "workarea")
 		{