summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspeidy <speidy@gmail.com>2015-08-03 23:41:55 -0400
committerspeidy <speidy@gmail.com>2015-08-03 23:41:55 -0400
commit253500ed4d41d2e92fea062eb1615f8891169526 (patch)
tree30fef7d2440ab662dcb2fe346ea234a1d033f3b7
parent0f14d1bbc5a4d38cec796cede79894bfb1a1a166 (diff)
parent49eb42b5b1109222dc3effe1a2ae6bb4b196ca07 (diff)
downloadxrdp-proprietary-253500ed4d41d2e92fea062eb1615f8891169526.tar.gz
xrdp-proprietary-253500ed4d41d2e92fea062eb1615f8891169526.zip
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel
-rw-r--r--libxrdp/xrdp_sec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index 2783fbce..06dfdda7 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -1929,7 +1929,7 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
}
else
{
- x1 = MIN(x1, client_info->minfo[index].left);
+ x1 = MIN(x1, client_info->minfo[index].left);
y1 = MIN(y1, client_info->minfo[index].top);
x2 = MAX(x2, client_info->minfo[index].right);
y2 = MAX(y2, client_info->minfo[index].bottom);
@@ -1941,7 +1941,7 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
if ((x2 > x1) && (y2 > y1))
{
- client_info->width = (x2 - x1) + 1;
+ client_info->width = (x2 - x1) + 1;
client_info->height = (y2 - y1) + 1;
}