diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
| commit | ce182e88a11c3f3a3218241a6046f3aeb08aabb7 (patch) | |
| tree | 0c738dec27fdbdf055bf72caa0c96a57d6a706cf /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (diff) | |
| parent | dc43f4c98287b283747e47e37501c5ca158a8aa6 (diff) | |
| download | nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.gz nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.bz2 nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.zip | |
Merge branch 'uli42-pr/simplify_free' into 3.6.x
Attributes GH PR #555: https://github.com/ArcticaProject/nx-libs/pull/555
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index cae0a397b..cafa219ec 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -610,12 +610,8 @@ Bool nxagentReconnectSession(void) nxagentXkbState.Initialized = 0; - if (nxagentOldKeyboard != NULL) - { - free(nxagentOldKeyboard); - - nxagentOldKeyboard = NULL; - } + free(nxagentOldKeyboard); + nxagentOldKeyboard = NULL; nxagentInitPointerMap(); @@ -739,12 +735,8 @@ nxagentReconnectError: nxagentDisconnectDisplay(); } - if (nxagentOldKeyboard != NULL) - { - free(nxagentOldKeyboard); - - nxagentOldKeyboard = NULL; - } + free(nxagentOldKeyboard); + nxagentOldKeyboard = NULL; return 0; } |