X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=19b4f8f0c3c5c53ac5472d2faded5b2dc3043b75;hb=032da34b786333a1af811235c5cf29855479f0b6;hp=c88dc56683473d21c419333a5a0aa231b9d85195;hpb=61e6e2da45373acea5dab93a6ede57aae9901b1b;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index c88dc566..19b4f8f0 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -77,7 +77,7 @@ Context::Context() :
 {
 	check(sr_init(&_structure));
 
-	struct sr_dev_driver **driver_list = sr_driver_list();
+	struct sr_dev_driver **driver_list = sr_driver_list(_structure);
 	if (driver_list)
 		for (int i = 0; driver_list[i]; i++)
 			_drivers[driver_list[i]->name] =
@@ -888,7 +888,7 @@ Session::Session(shared_ptr<Context> context) :
 	_context(context),
 	_saving(false)
 {
-	check(sr_session_new(context->structure, &_structure));
+	check(sr_session_new(context->_structure, &_structure));
 	_context->_session = this;
 }
 
@@ -898,7 +898,7 @@ Session::Session(shared_ptr<Context> context, string filename) :
 	_filename(filename),
 	_saving(false)
 {
-	check(sr_session_load(filename.c_str(), &_structure));
+	check(sr_session_load(context->_structure, filename.c_str(), &_structure));
 	GSList *dev_list;
 	check(sr_session_dev_list(_structure, &dev_list));
 	for (GSList *dev = dev_list; dev; dev = dev->next)