From 49ec9e075c345c18feb7be1eb59c31578ef532f0 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Fri, 10 Feb 2017 20:22:51 +0100 Subject: [PATCH] MainBar: Properly limit the lower value of the sample range This fixes bug #890. --- pv/toolbars/mainbar.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index 9bebda80..188786f1 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -611,9 +611,10 @@ void MainBar::export_file(shared_ptr format, const pv::util::Timestamp& start_time = trace_view->cursors()->first()->time(); const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time(); - const uint64_t start_sample = - std::max((double)0, start_time.convert_to() * samplerate); - const uint64_t end_sample = end_time.convert_to() * samplerate; + const uint64_t start_sample = (uint64_t)std::max( + (double)0, start_time.convert_to() * samplerate); + const uint64_t end_sample = (uint64_t)std::max( + (double)0, end_time.convert_to() * samplerate); sample_range = std::make_pair(start_sample, end_sample); } else { -- 2.30.2