|
 |
fd1a08 |
From bf9bce2c3e6c716cc708716484124c1fb47cb531 Mon Sep 17 00:00:00 2001
|
|
|
fd1a08 |
From: Max Roncace <me@caseif.net>
|
|
|
fd1a08 |
Date: Wed, 24 Feb 2021 17:44:28 -0500
|
|
|
fd1a08 |
Subject: [PATCH] Fix /monitor-list flag being ignored on X11/Wayland
|
|
|
fd1a08 |
|
|
|
fd1a08 |
---
|
|
|
fd1a08 |
client/Wayland/wlfreerdp.c | 4 +++-
|
|
|
fd1a08 |
client/X11/cli/xfreerdp.c | 4 +++-
|
|
|
fd1a08 |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
fd1a08 |
|
|
|
fd1a08 |
diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c
|
|
|
fd1a08 |
index aca734211..26c5452a5 100644
|
|
|
fd1a08 |
--- a/client/Wayland/wlfreerdp.c
|
|
|
fd1a08 |
+++ b/client/Wayland/wlfreerdp.c
|
|
|
fd1a08 |
@@ -651,10 +651,12 @@ int main(int argc, char* argv[])
|
|
|
fd1a08 |
status = freerdp_client_settings_parse_command_line(settings, argc, argv, FALSE);
|
|
|
fd1a08 |
if (status)
|
|
|
fd1a08 |
{
|
|
|
fd1a08 |
- BOOL list = settings->ListMonitors;
|
|
|
fd1a08 |
+ BOOL list;
|
|
|
fd1a08 |
|
|
|
fd1a08 |
rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
|
|
|
fd1a08 |
|
|
|
fd1a08 |
+ list = settings->ListMonitors;
|
|
|
fd1a08 |
+
|
|
|
fd1a08 |
if (list)
|
|
|
fd1a08 |
wlf_list_monitors(wlc);
|
|
|
fd1a08 |
|
|
|
fd1a08 |
diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c
|
|
|
fd1a08 |
index 5b7021944..786a7eb5d 100644
|
|
|
fd1a08 |
--- a/client/X11/cli/xfreerdp.c
|
|
|
fd1a08 |
+++ b/client/X11/cli/xfreerdp.c
|
|
|
fd1a08 |
@@ -59,10 +59,12 @@ int main(int argc, char* argv[])
|
|
|
fd1a08 |
status = freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE);
|
|
|
fd1a08 |
if (status)
|
|
|
fd1a08 |
{
|
|
|
fd1a08 |
- BOOL list = settings->ListMonitors;
|
|
|
fd1a08 |
+ BOOL list;
|
|
|
fd1a08 |
|
|
|
fd1a08 |
rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
|
|
|
fd1a08 |
|
|
|
fd1a08 |
+ list = settings->ListMonitors;
|
|
|
fd1a08 |
+
|
|
|
fd1a08 |
if (list)
|
|
|
fd1a08 |
xf_list_monitors(xfc);
|
|
|
fd1a08 |
|
|
|
fd1a08 |
--
|
|
|
fd1a08 |
2.37.1
|
|
|
fd1a08 |
|