X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=c7c2edb0b4eace1e1fcf290770527b35ac6d12fb;hp=aa2902375e02bd84e479d382b20e1ab32e4e3951;hb=35750e4dc619d538f105ed024f3a72b630108234;hpb=a38268f064687eff3e5395da6bb7f39e55dcd60f

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index aa290237..c7c2edb0 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,6 +20,14 @@
 
 #include <cassert>
 
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include "storesession.hpp"
 
 #include <pv/devicemanager.hpp>
@@ -55,6 +63,7 @@ using Glib::VariantBase;
 using sigrok::ConfigKey;
 using sigrok::Error;
 using sigrok::OutputFormat;
+using sigrok::OutputFlag;
 
 namespace pv {
 
@@ -91,8 +100,7 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const 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 +148,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(