diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-20 11:21:46 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-21 04:06:28 +0200 |
| commit | 560fd4e5f9ab33a92776d0de512e551f2895994f (patch) | |
| tree | c65e6167f1603125ce3acdaa8714e760b3d84d7e | |
| parent | 4aec11346c13f20940aeb4b91c25a3a9a4f6f853 (diff) | |
| download | nx-libs-560fd4e5f9ab33a92776d0de512e551f2895994f.tar.gz nx-libs-560fd4e5f9ab33a92776d0de512e551f2895994f.tar.bz2 nx-libs-560fd4e5f9ab33a92776d0de512e551f2895994f.zip | |
nxagent/hw/NXextension.c: Allow CloseDownProc to be NULL. Required code de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on).
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXextension.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c index 962367bf2..0c0145477 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c @@ -111,7 +111,7 @@ AddExtension(char *name, int NumEvents, int NumErrors, int i; register ExtensionEntry *ext, **newexts; - if (!MainProc || !SwappedMainProc || !CloseDownProc || !MinorOpcodeProc) + if (!MainProc || !SwappedMainProc || !MinorOpcodeProc) return((ExtensionEntry *) NULL); if ((lastEvent + NumEvents > LAST_EVENT) || (unsigned)(lastError + NumErrors > LAST_ERROR)) @@ -296,7 +296,8 @@ CloseDownExtensions() for (i = NumExtensions - 1; i >= 0; i--) { - (* extensions[i]->CloseDown)(extensions[i]); + if (extensions[i]->CloseDown) + (* extensions[i]->CloseDown)(extensions[i]); NumExtensions = i; xfree(extensions[i]->name); for (j = extensions[i]->num_aliases; --j >= 0;) |