X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=66d80f1a4bde58b649cc571d1194431824f6f516;hb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;hp=eec1a051b5a8838ba3f81b58c0759adbadb024a9;hpb=303eec78f3c499cd30fc88b282aa1f336e82a806;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index eec1a05..66d80f1 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -43,11 +43,11 @@
 
 #include "toolbars/mainbar.hpp"
 
-#include "view/analogsignal.hpp"
-#include "view/decodetrace.hpp"
-#include "view/logicsignal.hpp"
-#include "view/signal.hpp"
-#include "view/view.hpp"
+#include "views/trace/analogsignal.hpp"
+#include "views/trace/decodetrace.hpp"
+#include "views/trace/logicsignal.hpp"
+#include "views/trace/signal.hpp"
+#include "views/trace/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -849,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