X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=2a4c8500a37b532a3341ed6db473bf33528d6043;hp=9a481dd86696ba60ae5e4b61c03bd9719156b1c8;hb=40ec0302a21055e85572ced539c457f0d8484c82;hpb=be7645e8d02d1865f9bc1a4a9bb397812ea3c380

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 9a481dd..2a4c850 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -160,16 +160,20 @@ bool StoreSession::start()
 	}
 
 	// Check whether the user wants to export a certain sample range
+	uint64_t end_sample;
+
 	if (sample_range_.first == sample_range_.second) {
 		start_sample_ = 0;
 		sample_count_ =	any_segment->get_sample_count();
 	} else {
 		if (sample_range_.first > sample_range_.second) {
 			start_sample_ = sample_range_.second;
-			sample_count_ = sample_range_.first - sample_range_.second;
+			end_sample = min(sample_range_.first, any_segment->get_sample_count());
+			sample_count_ = end_sample - start_sample_;
 		} else {
 			start_sample_ = sample_range_.first;
-			sample_count_ = sample_range_.second - sample_range_.first;
+			end_sample = min(sample_range_.second, any_segment->get_sample_count());
+			sample_count_ = end_sample - start_sample_;
 		}
 	}