From: Ralf <redacted>
Date: Sun, 10 Jan 2021 12:43:51 +0000 (+0100)
Subject: Save data: Catch Error exception
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=f9319755734823208210b1e244b827ecb6820346

Save data: Catch Error exception

How to reproduce: Save data to Read-Only disk
---

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index ed0b0def..182642ee 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -301,10 +301,14 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 		units_stored_ = unit_count_ - (sample_count_ >> progress_scale);
 	}
 
-	auto dfend = context->create_end_packet();
-	const string ldata_str = output_->receive(dfend);
-	if (output_stream_.is_open())
-		output_stream_ << ldata_str;
+	try {
+		auto dfend = context->create_end_packet();
+		const string ldata_str = output_->receive(dfend);
+		if (output_stream_.is_open())
+			output_stream_ << ldata_str;
+	} catch (Error& error) {
+		error_ = tr("Error while saving: ") + error.what();
+	}
 
 	// Zeroing the progress variables indicates completion
 	units_stored_ = unit_count_ = 0;