ensure delegates are destroyed before their threads

smartdevicelink · May 21, 2020 · 30f5e86 · 30f5e86
1 parent 42d6654
commit 30f5e86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc
@@ -107,6 +107,9 @@ void TelemetryMonitor::Stop() {
   if (thread_) {
     thread_->stop();
     thread_->join();
+    if (thread_->delegate()) {
+      streamer_.reset();
+    }
     threads::DeleteThread(thread_);
   }
   thread_ = NULL;

diff --git a/src/components/utils/src/timer.cc b/src/components/utils/src/timer.cc
@@ -65,8 +65,8 @@ timer::Timer::~Timer() {
   StopDelegate();
   single_shot_ = true;
 
-  DeleteThread(thread_);
   delegate_.reset();
+  DeleteThread(thread_);
   DCHECK(task_);
   delete task_;
   LOG4CXX_DEBUG(logger_, "Timer " << name_ << " has been destroyed");