X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=4f6bc41d551c4182919539cb3810882f9e10e60d;hp=65071330da07e1d24c5955448ad44efe3f929383;hb=add091eb7183fb399db139f29f3a0b4c85bd4273;hpb=b926e4eeef6db657601ebd4bbededdf9d329cdd6

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 65071330..4f6bc41d 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -74,6 +74,7 @@ using std::cerr;
 using std::endl;
 using std::list;
 using std::map;
+using std::max;
 using std::pair;
 using std::shared_ptr;
 using std::string;
@@ -257,7 +258,8 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
 		const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
 		const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
 
-		const uint64_t start_sample = start_time.convert_to<double>() * samplerate;
+		const uint64_t start_sample =
+			std::max((double)0, start_time.convert_to<double>() * samplerate);
 		const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
 
 		sample_range = std::make_pair(start_sample, end_sample);
@@ -274,7 +276,7 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
 		filter += "(*.*)";
 	else
 		filter += QString("(*.%1);;%2 (*.*)").arg(
-			QString::fromStdString(join(exts, ", *."))).arg(
+			QString::fromStdString(join(exts, ", *.")),
 			tr("All Files"));
 
 	// Show the file dialog
@@ -315,7 +317,7 @@ void MainWindow::import_file(shared_ptr<InputFormat> format)
 	const vector<string> exts = format->extensions();
 	const QString filter = exts.empty() ? "" :
 		tr("%1 files (*.%2)").arg(
-			QString::fromStdString(format->description())).arg(
+			QString::fromStdString(format->description()),
 			QString::fromStdString(join(exts, ", *.")));
 
 	// Show the file dialog