Update for unification of monitor processing

Related to neutrinolabs/xrdp#1895
Nexarian · Mar 21, 2022 · b9de2ee · b9de2ee
1 parent 752b765
commit b9de2ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/module/rdpClientCon.c b/module/rdpClientCon.c
@@ -971,14 +971,14 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
     {
         LLOGLN(0, ("  client can not do new(color) cursor"));
     }
-    if (clientCon->client_info.monitorCount > 0)
+    if (clientCon->client_info.display_sizes.monitorCount > 0)
     {
         LLOGLN(0, ("  client can do multimon"));
-        LLOGLN(0, ("  client monitor data, monitorCount=%d", clientCon->client_info.monitorCount));
+        LLOGLN(0, ("  client monitor data, monitorCount=%d", clientCon->client_info.display_sizes.monitorCount));
         clientCon->doMultimon = 1;
         dev->doMultimon = 1;
-        memcpy(dev->minfo, clientCon->client_info.minfo, sizeof(dev->minfo));
-        dev->monitorCount = clientCon->client_info.monitorCount;
+        memcpy(dev->minfo, clientCon->client_info.display_sizes.minfo, sizeof(dev->minfo));
+        dev->monitorCount = clientCon->client_info.display_sizes.monitorCount;
 
         box.x1 = dev->minfo[0].left;
         box.y1 = dev->minfo[0].top;

diff --git a/scripts/install_xorgxrdp_build_dependencies_with_apt.sh b/scripts/install_xorgxrdp_build_dependencies_with_apt.sh
@@ -40,7 +40,8 @@ in
         ;;
 esac
 
-exec apt-get -yq \
+apt-get update
+apt-get -yq \
     --no-install-suggests \
     --no-install-recommends \
     $APT_EXTRA_ARGS \