From 67d7df713e225a3bdb7f8506245aa39277619597 Mon Sep 17 00:00:00 2001 From: bernatx Date: Thu, 21 Jul 2022 23:26:17 +0200 Subject: [PATCH] Changing from weak_ptr to shared_ptr for storing sessions --- .../source/carla/streaming/detail/Dispatcher.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/LibCarla/source/carla/streaming/detail/Dispatcher.cpp b/LibCarla/source/carla/streaming/detail/Dispatcher.cpp index baa180334..0ba537b94 100644 --- a/LibCarla/source/carla/streaming/detail/Dispatcher.cpp +++ b/LibCarla/source/carla/streaming/detail/Dispatcher.cpp @@ -62,8 +62,8 @@ namespace detail { log_debug("Calling CloseStream for ", id); auto search = _stream_map.find(id); if (search != _stream_map.end()) { - auto stream_state = search->second.lock(); - if (stream_state != nullptr) { + auto stream_state = search->second; + if (stream_state) { log_debug("Disconnecting all sessions (stream ", id, ")"); stream_state->ClearSessions(); } @@ -76,8 +76,8 @@ namespace detail { std::lock_guard lock(_mutex); auto search = _stream_map.find(session->get_stream_id()); if (search != _stream_map.end()) { - auto stream_state = search->second.lock(); - if (stream_state != nullptr) { + auto stream_state = search->second; + if (stream_state) { log_debug("Connecting session (stream ", session->get_stream_id(), ")"); stream_state->ConnectSession(std::move(session)); log_debug("Current streams: ", _stream_map.size()); @@ -94,8 +94,8 @@ namespace detail { log_debug("Calling DeregisterSession for ", session->get_stream_id()); auto search = _stream_map.find(session->get_stream_id()); if (search != _stream_map.end()) { - auto stream_state = search->second.lock(); - if (stream_state != nullptr) { + auto stream_state = search->second; + if (stream_state) { log_debug("Disconnecting session (stream ", session->get_stream_id(), ")"); stream_state->DisconnectSession(session); log_debug("Current streams: ", _stream_map.size());