From a83ec33d5f4d4d60e25d14053282c31dc0e09655 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 16 Jan 2021 22:13:05 +0100 Subject: Screen.c: remove superflous code that produces a crash Fixes ArcticaProject/nx-libs#987 --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 173d2fb82..a6b312aaa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -337,12 +337,6 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen) */ void nxagentMaximizeToFullScreen(ScreenPtr pScreen) { - if (nxagentOption(AllScreens)) - nxagentSwitchAllScreens(pScreen, True); - else - nxagentSwitchFullscreen(pScreen, True); - return; - /* XUnmapWindow(nxagentDisplay, nxagentIconWindow); */ -- cgit v1.2.3 From e156bdc0350e14dbd0429fab899b4eb9ee1a201b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 16 Jan 2021 22:31:44 +0100 Subject: Args.c: improve usage string for -geometry --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index f24d15c55..72d6d050c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -2083,7 +2083,7 @@ void ddxUseMsg(void) ErrorF("-full utilize full regeneration\n"); ErrorF("-class string default visual class\n"); ErrorF("-depth int default depth\n"); - ErrorF("-geometry WxH+X+Y window size and position\n"); + ErrorF("-geometry string window size and position (WXH+X+Y) or 'allscreens' / 'onescreen'\n"); ErrorF("-bw int window border width\n"); ErrorF("-name string window name\n"); ErrorF("-scrns int number of screens to generate\n"); -- cgit v1.2.3