summaryrefslogtreecommitdiffstats
path: root/xorg/server/module
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-06-18 20:13:18 -0700
committerJay Sorg <jay.sorg@gmail.com>2014-06-18 20:13:18 -0700
commit66f8a0bf2573554728e366b93f8848bdfd444977 (patch)
tree3e34df4c989252a5465345e622aa9c831bc50222 /xorg/server/module
parent293c404a1229b3c8f07de0b074ac5f28529f945c (diff)
downloadxrdp-proprietary-66f8a0bf2573554728e366b93f8848bdfd444977.tar.gz
xrdp-proprietary-66f8a0bf2573554728e366b93f8848bdfd444977.zip
xorg: fix a crash when disconnecting
Diffstat (limited to 'xorg/server/module')
-rw-r--r--xorg/server/module/rdpClientCon.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg/server/module/rdpClientCon.c b/xorg/server/module/rdpClientCon.c
index e375b4e2..24870557 100644
--- a/xorg/server/module/rdpClientCon.c
+++ b/xorg/server/module/rdpClientCon.c
@@ -259,6 +259,11 @@ rdpClientConDisconnect(rdpPtr dev, rdpClientCon *clientCon)
}
rdpRegionDestroy(clientCon->dirtyRegion);
rdpRegionDestroy(clientCon->shmRegion);
+ if (clientCon->updateTimer != NULL)
+ {
+ TimerCancel(clientCon->updateTimer);
+ TimerFree(clientCon->updateTimer);
+ }
g_free(clientCon);
return 0;
}