X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=9af7df74e7a5f967023a20a62c4f6e68ed3d8c16;hb=2445d0b3d64ab051d8a686506910224f9f4e45c7;hp=90fb2798abb7f5aa63e766c9973b0cc61c71fc5d;hpb=996b7c9da9b5cb56413e829217e1e7d7d7d520da;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 90fb279..9af7df7 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -479,20 +479,6 @@ void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 	signals_changed();
 }
 
-bool SigSession::is_trigger_enabled() const
-{
-	assert(_dev_inst);
-	assert(_dev_inst->dev_inst());
-	for (const GSList *l = _dev_inst->dev_inst()->probes; l; l = l->next) {
-		const sr_probe *const p = (const sr_probe *)l->data;
-		assert(p);
-		if (p->trigger && p->trigger[0] != '\0')
-			return true;
-	}
-
-	return false;
-}
-
 shared_ptr<view::Signal> SigSession::signal_from_probe(
 	const sr_probe *probe) const
 {
@@ -596,7 +582,8 @@ void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
 		return;
 	}
 
-	set_capture_state(is_trigger_enabled() ? AwaitingTrigger : Running);
+	set_capture_state(dev_inst->is_trigger_enabled() ?
+		AwaitingTrigger : Running);
 
 	sr_session_run();
 	sr_session_destroy();