From 293dd3c2e9afc529f3b697dc81012211a87ccd71 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 17 Sep 2018 13:33:06 -0700 Subject: [PATCH] sharedpv simplify logic duh... always empty() after clear() --- src/server/sharedstate_pv.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/sharedstate_pv.cpp b/src/server/sharedstate_pv.cpp index 20f56ee..c0256f7 100644 --- a/src/server/sharedstate_pv.cpp +++ b/src/server/sharedstate_pv.cpp @@ -264,10 +264,9 @@ void SharedPV::close(bool destroy) puts.clear(); rpcs.clear(); monitors.clear(); - bool wasempty = channels.empty(); - channels.clear(); - if(!wasempty && channels.empty()) + if(!channels.empty()) p_handler = handler; + channels.clear(); } } FOR_EACH(xputs_t::iterator, it, end, p_put) {