Fix #775 by catching and handling the thrown exception

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index 31ca328deca53bf1c9cfd90d426fb228da228af6..c18f809446a037475f4106e10576f3a89d5c1688 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -20,6 +20,7 @@
 #include <QFileInfo>
 
 #include <cassert>
+#include <memory>
 #include <mutex>
 #include <stdexcept>
 
@@ -71,6 +72,7 @@ using std::recursive_mutex;
 using std::runtime_error;
 using std::shared_ptr;
 using std::string;
+using std::unique_ptr;
 using std::unordered_set;
 using std::vector;
 
@@ -847,7 +849,14 @@ void Session::sample_thread_proc(function<void (const QString)> error_handler)
        set_capture_state(device_->session()->trigger() ?
                AwaitingTrigger : Running);
 
-       device_->run();
+       try {
+               device_->run();
+       } catch (Error e) {
+               error_handler(e.what());
+               set_capture_state(Stopped);
+               return;
+       }
+
        set_capture_state(Stopped);
 
        // Confirm that SR_DF_END was received
@@ -975,12 +984,15 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
        const vector<shared_ptr<Channel>> channels = analog->channels();
        const unsigned int channel_count = channels.size();
        const size_t sample_count = analog->num_samples() / channel_count;
-       const float *data = static_cast<const float *>(analog->data_pointer());
        bool sweep_beginning = false;
 
+       unique_ptr<float> data(new float[analog->num_samples()]);
+       analog->get_data_as_float(data.get());
+
        if (signalbases_.empty())
                update_signals();
 
+       float *channel_data = data.get();
        for (auto channel : channels) {
                shared_ptr<data::AnalogSegment> segment;
 
@@ -1014,7 +1026,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                assert(segment);
 
                // Append the samples in the segment
-               segment->append_interleaved_samples(data++, sample_count,
+               segment->append_interleaved_samples(channel_data++, sample_count,
                        channel_count);
        }