Fix #615 by opening the output stream only if needed

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index e4af5db7bcf40d8b123449a676e472c814f3c9d2..9a30c24379b37a691af0750640997211ee725603 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -55,6 +55,7 @@ using Glib::VariantBase;
 using sigrok::ConfigKey;
 using sigrok::Error;
 using sigrok::OutputFormat;
+using sigrok::OutputFlag;
 
 namespace pv {
 
@@ -91,12 +92,15 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-       set< shared_ptr<data::SignalData> > data_set =
-               session_.get_data();
-
        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;
+
+       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 +118,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 +141,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(