X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=35582b43a411d92ced14ba45e3b7a124b320d3a0;hb=e71eb81c946c3524e01eaef9781ccbf170143d0c;hp=a3d745b387834e4f76a2516164ca0aa48540125e;hpb=de6e819c8a6b3f61e69bbb53b5c853ee6686641e;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index a3d745b..35582b4 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 {
 
@@ -92,7 +96,7 @@ const QString& StoreSession::error() const
 bool StoreSession::start()
 {
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+	const unordered_set< shared_ptr<view::Signal> > &sigs(session_.signals());
 
 	// Add enabled channels to the data set
 	set< shared_ptr<data::SignalData> > data_set;
@@ -140,8 +144,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(