X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_output%2Fview.cpp;h=0f127c8751d72340530f0a940a407c255f725115;hp=f22f6c5d508bf47dfeeaecc61c588501dbf7ff3b;hb=a767229eb18acbd70af38bb660c8ebd1bbd82e73;hpb=feda6c6bbde575242cf01c769c0ecd3e89f9f7a0

diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp
index f22f6c5d..0f127c87 100644
--- a/pv/views/decoder_output/view.cpp
+++ b/pv/views/decoder_output/view.cpp
@@ -53,7 +53,7 @@ const char* SaveTypeNames[SaveTypeCount] = {
 	"Binary",
 	"Hex Dump, plain",
 	"Hex Dump, with offset",
-	"Hex Dump, complete"
+	"Hex Dump, canonical"
 };
 
 
@@ -265,6 +265,8 @@ void View::save_data() const
 		pair<size_t, size_t> selection = hex_view_->get_selection();
 
 		vector<uint8_t> data;
+		data.resize(selection.second - selection.first + 1);
+
 		signal_->get_merged_binary_data_chunks_by_offset(current_segment_, decoder_,
 			bin_class_id_, selection.first, selection.second, &data);
 
@@ -303,6 +305,8 @@ void View::save_data_as_hex_dump(bool with_offset, bool with_ascii) const
 		pair<size_t, size_t> selection = hex_view_->get_selection();
 
 		vector<uint8_t> data;
+		data.resize(selection.second - selection.first + 1);
+
 		signal_->get_merged_binary_data_chunks_by_offset(current_segment_, decoder_,
 			bin_class_id_, selection.first, selection.second, &data);
 
@@ -463,7 +467,7 @@ void View::on_actionSave_triggered(QAction* action)
 
 void View::perform_delayed_view_update()
 {
-	if (!binary_data_exists_)
+	if (signal_ && !binary_data_exists_)
 		if (signal_->get_binary_data_chunk_count(current_segment_, decoder_, bin_class_id_))
 			binary_data_exists_ = true;