diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
| commit | c8d69ebaeed8005d38c91613ab699747f45b2228 (patch) | |
| tree | cd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 105cd2be6dfce3579cb585a8d78f655f19cef57b (diff) | |
| parent | 4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff) | |
| download | nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2 nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip | |
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 86d3ba502..cfa0ec804 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -83,7 +83,7 @@ extern Bool nxagentReconnectAllPicture(void*); extern Bool nxagentDisconnectAllPicture(void); extern Bool nxagentDisconnectAllWindows(void); -extern Bool nxagentDisconnectAllCursor(void); +extern void nxagentDisconnectAllCursor(void); extern Bool nxagentReconnectFailedFonts(void*); extern Bool nxagentInstallFontServerPath(void); @@ -519,6 +519,7 @@ Bool nxagentReconnectSession(void) nxagentEmptyBSPixmapList(); + /* FIXME: nxagentReconnectAllPixmaps will always return 1 */ if (nxagentReconnectAllPixmaps(reconnectLossyLevel[PIXMAP_STEP]) == 0) { failedStep = PIXMAP_STEP; |