X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=efb4995db6152f705053f041830daae6c04fbdd6;hp=da21086c50510199456e8b0a18c2a85815be825c;hb=e835e8080b6278137ea90f3b10e5d8bc51136a91;hpb=9f42e2e6beb6f09b137501bcf402b36a64dcd211

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index da21086c..efb4995d 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -1138,7 +1138,11 @@ shared_ptr<Trigger> Session::trigger()
 
 void Session::set_trigger(shared_ptr<Trigger> trigger)
 {
-	check(sr_session_trigger_set(_structure, trigger->_structure));
+	if (!trigger)
+		// Set NULL trigger, i.e. remove any trigger from the session.
+		check(sr_session_trigger_set(_structure, NULL));
+	else
+		check(sr_session_trigger_set(_structure, trigger->_structure));
 	_trigger = trigger;
 }