X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=a44c6f9916f3b326a05e932950cee0acfacedf40;hb=341d9a7975be53bb44af8d2deeba9b4a5e086929;hp=dd06cfed360a2bd6a45e65577d2441e30404639e;hpb=4e86ec7042631d4b54876cba89c01a73abaf7213;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index dd06cfe..a44c6f9 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -960,14 +960,14 @@ void Session::free_unused_memory()
 
 void Session::signal_new_segment()
 {
-	int new_segment_id = 1;
+	int new_segment_id = 0;
 
 	if ((cur_logic_segment_ != nullptr) || !cur_analog_segments_.empty()) {
 
 		// Determine new frame/segment number, assuming that all
 		// signals have the same number of frames/segments
 		if (cur_logic_segment_) {
-			new_segment_id = logic_data_->get_segment_count();
+			new_segment_id = logic_data_->get_segment_count() - 1;
 		} else {
 			shared_ptr<sigrok::Channel> any_channel =
 				(*cur_analog_segments_.begin()).first;
@@ -978,7 +978,7 @@ void Session::signal_new_segment()
 			shared_ptr<data::Analog> data(base->analog_data());
 			assert(data);
 
-			new_segment_id = data->get_segment_count();
+			new_segment_id = data->get_segment_count() - 1;
 		}
 	}
 
@@ -1097,7 +1097,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const size_t sample_count = analog->num_samples() / channel_count;
 	bool sweep_beginning = false;
 
-	unique_ptr<float> data(new float[analog->num_samples()]);
+	unique_ptr<float[]> data(new float[analog->num_samples()]);
 	analog->get_data_as_float(data.get());
 
 	if (signalbases_.empty())