X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=c464942893c271a16c637a4df1c5aac982d9cd9c;hp=df09ff3b2ebc0b924a9158158de9a2362ab385db;hb=7db61e770abd2d1c7eb326a09e35cd4266664c1d;hpb=73e377feaaf01e790c87a4a0c918a36e87a9a6b9

diff --git a/pv/session.cpp b/pv/session.cpp
index df09ff3..c464942 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -954,7 +954,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 		// Create a new data segment
 		cur_logic_segment_ = shared_ptr<data::LogicSegment>(
-			new data::LogicSegment(logic, cur_samplerate_));
+			new data::LogicSegment(*logic_data_, logic, cur_samplerate_));
 		logic_data_->push_segment(cur_logic_segment_);
 
 		// @todo Putting this here means that only listeners querying
@@ -997,11 +997,6 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 			// in the sweep containing this segment.
 			sweep_beginning = true;
 
-			// Create a segment, keep it in the maps of channels
-			segment = shared_ptr<data::AnalogSegment>(
-				new data::AnalogSegment(cur_samplerate_));
-			cur_analog_segments_[channel] = segment;
-
 			// Find the analog data associated with the channel
 			shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
 			assert(base);
@@ -1009,6 +1004,11 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 			shared_ptr<data::Analog> data(base->analog_data());
 			assert(data);
 
+			// Create a segment, keep it in the maps of channels
+			segment = shared_ptr<data::AnalogSegment>(
+				new data::AnalogSegment(*data, cur_samplerate_));
+			cur_analog_segments_[channel] = segment;
+
 			// Push the segment into the analog data.
 			data->push_segment(segment);
 		}