From 731767b086e8146f31c1f9038568e3c852c609f7 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 8 Oct 2018 07:10:03 -0700 Subject: [PATCH] SharedPV fix onFirstConnect() on monitor creation --- src/server/sharedstate_channel.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/sharedstate_channel.cpp b/src/server/sharedstate_channel.cpp index e8373314..41ebbe04 100644 --- a/src/server/sharedstate_channel.cpp +++ b/src/server/sharedstate_channel.cpp @@ -242,9 +242,10 @@ pva::Monitor::shared_pointer SharedChannel::createMonitor( requester->monitorConnect(sts, pvd::MonitorPtr(), pvd::StructureConstPtr()); ret.reset(); - } else if(notify) { - ret->notify(); - + } else { + if(notify) { + ret->notify(); + } if(handler) { handler->onFirstConnect(owner); }