Refs #21186: Apply rev suggestions (2)

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jul 19, 2024 · 4c5fa90 · 4c5fa90
1 parent 78bd1a6
commit 4c5fa90
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/examples/cpp/topic_instances/SubscriberApp.cpp b/examples/cpp/topic_instances/SubscriberApp.cpp
@@ -165,6 +165,13 @@ void SubscriberApp::on_data_available(
             // Print the shape
             std::cout << shape_.color() << " Shape with size " << shape_.shapesize()
                       << " at X:" << shape_.x() << ", Y:" << shape_.y() << " RECEIVED" << std::endl;
+
+            // Check if the execution should be stopped
+            if ((samples_ > 0) && instances_received_all_samples())
+            {
+                stop_receiving_samples_.store(true);
+                cv_.notify_all();
+            }
         }
         else if (info.instance_state == NOT_ALIVE_DISPOSED_INSTANCE_STATE)
         {
@@ -179,13 +186,6 @@ void SubscriberApp::on_data_available(
         {
             std::cout << shape_.color() << " Shape has been disposed by all publishers" << std::endl;
         }
-
-        // Check if the execution should be stopped
-        if ((samples_ > 0) && instances_received_all_samples())
-        {
-            stop_receiving_samples_.store(true);
-            cv_.notify_all();
-        }
     }
 }
 
@@ -195,15 +195,15 @@ void SubscriberApp::run()
         std::unique_lock<std::mutex> lock_(mutex_);
         cv_.wait(lock_, [&]
                 {
-                    return stop_receiving_samples_.load();
+                    return stop_receiving_samples_.load() || is_stopped();
                 });
     }
     // Wait for period or stop event
     {
         std::unique_lock<std::mutex> timeout_lock(mutex_);
         cv_.wait_for(timeout_lock, std::chrono::milliseconds(50u), [&]()
                 {
-                    return instances_disposed();
+                    return instances_disposed() || is_stopped();
                 });
     }
     stop();