X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=da2f963be9eb99609786800e9c45ad3ece294040;hp=e4af5db7bcf40d8b123449a676e472c814f3c9d2;hb=bf9146988d2298e1750142dccdcf597ef13d6606;hpb=a42efb9d247268dde5c78f112b3970211bac4088

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index e4af5db7..da2f963b 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,6 +20,9 @@
 
 #include <cassert>
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include "storesession.hpp"
 
 #include <pv/devicemanager.hpp>
@@ -55,6 +58,7 @@ using Glib::VariantBase;
 using sigrok::ConfigKey;
 using sigrok::Error;
 using sigrok::OutputFormat;
+using sigrok::OutputFlag;
 
 namespace pv {
 
@@ -91,12 +95,14 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-	set< shared_ptr<data::SignalData> > data_set =
-		session_.get_data();
+	const unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+
+	// Add enabled channels to the data set
+	set< shared_ptr<data::SignalData> > data_set;
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const unordered_set< shared_ptr<view::Signal> > &sigs(
-		session_.signals());
+	for (shared_ptr<view::Signal> signal : sigs)
+		if (signal->enabled())
+			data_set.insert(signal->data());
 
 	// Check we have logic data
 	if (data_set.empty() || sigs.empty()) {
@@ -114,7 +120,7 @@ bool StoreSession::start()
 	shared_ptr<data::Logic> data;
 	if (!(data = dynamic_pointer_cast<data::Logic>(*data_set.begin()))) {
 		error_ = tr("PulseView currently only has support for "
-			"storing a logic data.");
+			"storing logic data.");
 		return false;
 	}
 
@@ -137,8 +143,9 @@ bool StoreSession::start()
 
 		map<string, Glib::VariantBase> options = options_;
 
-		output_stream_.open(file_name_, ios_base::binary |
-			ios_base::trunc | ios_base::out);
+		if (!output_format_->test_flag(OutputFlag::INTERNAL_IO_HANDLING))
+			output_stream_.open(file_name_, ios_base::binary |
+					ios_base::trunc | ios_base::out);
 
 		output_ = output_format_->create_output(file_name_, device, options);
 		auto meta = context->create_meta_packet(