summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_mm.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-08-19 15:46:28 -0700
committerJay Sorg <jay.sorg@gmail.com>2014-08-19 15:46:28 -0700
commit4afe769467e4cde7d4251ddb5ae335c28e62a5a6 (patch)
treea1ebc34078dcffafecb369dc651df59e18fd3cf7 /xrdp/xrdp_mm.c
parentd17c4a78fb3956f010645550e86e038cc460c93d (diff)
downloadxrdp-proprietary-4afe769467e4cde7d4251ddb5ae335c28e62a5a6.tar.gz
xrdp-proprietary-4afe769467e4cde7d4251ddb5ae335c28e62a5a6.zip
xrdp: encoder shutdown fix
Diffstat (limited to 'xrdp/xrdp_mm.c')
-rw-r--r--xrdp/xrdp_mm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 179a44e7..76957ad6 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -129,9 +129,6 @@ xrdp_mm_module_cleanup(struct xrdp_mm *self)
{
log_message(LOG_LEVEL_DEBUG, "xrdp_mm_module_cleanup");
- /* shutdown thread */
- deinit_xrdp_encoder(self);
-
if (self->mod != 0)
{
if (self->mod_exit != 0)
@@ -175,6 +172,10 @@ xrdp_mm_delete(struct xrdp_mm *self)
/* free any module stuff */
xrdp_mm_module_cleanup(self);
+
+ /* shutdown thread */
+ deinit_xrdp_encoder(self);
+
trans_delete(self->sesman_trans);
self->sesman_trans = 0;
self->sesman_trans_up = 0;