summaryrefslogtreecommitdiff
path: root/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc')
-rw-r--r--src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index 9fb0921c4b..bdacd68006 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -82,6 +82,7 @@ TransportAdapterImpl::TransportAdapterImpl(
}
TransportAdapterImpl::~TransportAdapterImpl() {
+ listeners_.clear();
Terminate();
if (device_scanner_) {
@@ -158,10 +159,9 @@ TransportAdapter::Error TransportAdapterImpl::Init() {
initialised_ = (error == OK);
- if (get_settings().use_last_state()) {
+ if (get_settings().use_last_state() && initialised_) {
if (!Restore()) {
LOG4CXX_WARN(logger_, "could not restore transport adapter state");
- error = FAIL;
}
}
LOG4CXX_TRACE(logger_, "exit with error: " << error);