Rework all subthread-based workers to make notifications more robust

[pulseview.git] / pv / data / logicsegment.cpp

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index a1832576916ae1dabad15ceb464768cb3521a205..22f1d38a0095565cabdeb807180c0e7aff3c934d 100644 (file)
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -328,6 +328,7 @@ void LogicSegment::append_payload(shared_ptr<sigrok::Logic> logic)
 
 void LogicSegment::append_payload(void *data, uint64_t data_size)
 {
+       assert(unit_size_ > 0);
        assert((data_size % unit_size_) == 0);
 
        lock_guard<recursive_mutex> lock(mutex_);
@@ -341,10 +342,10 @@ void LogicSegment::append_payload(void *data, uint64_t data_size)
        append_payload_to_mipmap();
 
        if (sample_count > 1)
-               owner_.notify_samples_added(shared_ptr<Segment>(shared_from_this()),
+               owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
                        prev_sample_count + 1, prev_sample_count + 1 + sample_count);
        else
-               owner_.notify_samples_added(shared_ptr<Segment>(shared_from_this()),
+               owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
                        prev_sample_count + 1, prev_sample_count + 1);
 }