From 7ca0688326d72113e8c424a826dfde1ece44a9d3 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 1 Nov 2017 13:33:40 -0500 Subject: [PATCH] second destroy() is a no-op --- src/remoteClient/clientContextImpl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index 9bf41ed..e917f47 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -3152,6 +3152,8 @@ public: public ChannelImpl, public TimerCallback { + InternalChannelImpl(InternalChannelImpl&); + InternalChannelImpl& operator=(const InternalChannelImpl&); public: POINTER_DEFINITIONS(InternalChannelImpl); private: @@ -3334,8 +3336,6 @@ private: virtual void destroy() OVERRIDE FINAL { - REFTRACE_DECREMENT(num_active); - destroy(false); } @@ -3567,6 +3567,7 @@ public: return; //throw std::runtime_error("Channel already destroyed."); } + REFTRACE_DECREMENT(num_active); destroyChannel(force); }