[X2Go-Commits] [nx-libs] 43/51: Screen.c: move identical line out of both parts of an if clause

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 8dea30751d5917482527489ca292714a7874f42c
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Jan 11 23:25:39 2019 +0100

    Screen.c: move identical line out of both parts of an if clause
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index d8cf695..1af6215 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1011,6 +1011,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
     resetAgentPosition = True;
   }
 
+  nxagentChangeOption(BorderWidth, 0);
+
   if (nxagentOption(Fullscreen))
   {
     nxagentChangeOption(X, 0);
@@ -1019,7 +1021,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
     nxagentChangeOption(Width, WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)));
     nxagentChangeOption(Height, HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)));
 
-    nxagentChangeOption(BorderWidth, 0);
 
     if (nxagentReconnectTrap == False || nxagentResizeDesktopAtStartup)
     {
@@ -1052,8 +1053,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
   }
   else
   {
-    nxagentChangeOption(BorderWidth, 0);
-
     if (nxagentReconnectTrap == False)
     {
       nxagentChangeOption(RootX, 0);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git