second destroy() is a no-op

This commit is contained in:
Michael Davidsaver
2017-11-01 13:33:40 -05:00
parent e7c7d28339
commit 7ca0688326

View File

@@ -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);
}