X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=b0f33f4a7a2ae674f2253ca16bedf11362475dfb;hp=4167bdae69e0e174af32d5ecc993a35a1792ea4d;hb=13e475e412663ee904b94a6510b5628bdb8b84fa;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 4167bdae..b0f33f4a 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -217,10 +217,6 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 {
 	unsigned progress_scale = 0;
 
-	/// TODO: Wrap this in a std::unique_ptr when we transition to C++11
-	uint8_t *const ldata = new uint8_t[BlockSize];
-	assert(ldata);
-
 	int aunit_size = 0;
 	int lunit_size = 0;
 	unsigned int lsamples_per_block = INT_MAX;
@@ -262,8 +258,6 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 				const float *adata =
 					asegment->get_samples(start_sample_, start_sample_ + packet_len);
 
-				// The srzip format currently only supports packets with one
-				// analog channel. See zip_append_analog() in srzip.c
 				auto analog = context->create_analog_packet(
 					vector<shared_ptr<sigrok::Channel> >{achannel},
 					(float *)adata, packet_len,
@@ -278,14 +272,17 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 			}
 
 			if (lsegment) {
-				lsegment->get_samples(ldata, start_sample_, start_sample_ + packet_len);
+				const uint8_t* ldata =
+					lsegment->get_samples(start_sample_, start_sample_ + packet_len);
 
 				const size_t length = packet_len * lunit_size;
-				auto logic = context->create_logic_packet(ldata, length, lunit_size);
+				auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
 				const string ldata_str = output_->receive(logic);
 
 				if (output_stream_.is_open())
 					output_stream_ << ldata_str;
+
+				delete[] ldata;
 			}
 		} catch (Error error) {
 			error_ = tr("Error while saving: ") + error.what();
@@ -300,12 +297,11 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 	// Zeroing the progress variables indicates completion
 	units_stored_ = unit_count_ = 0;
 
+	store_successful();
 	progress_updated();
 
 	output_.reset();
 	output_stream_.close();
-
-	delete[] ldata;
 }
 
 } // pv