X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=f4506787364fa11ea01286cf2e569ffed5587c15;hp=56b4dd5f1a4ed12c08bf2037061a48ad9ac7264d;hb=820c3dea881d351f2bbf4e03c2302f5ca645df63;hpb=be03620eb7b765ff01f52d0f8b9e7dac308524c5

diff --git a/main.cpp b/main.cpp
index 56b4dd5f..f4506787 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,6 +48,8 @@ void usage()
 int main(int argc, char *argv[])
 {
 	int ret = 0;
+	struct sr_context *sr_ctx = NULL;
+
 	QApplication a(argc, argv);
 
 	// Set some application metadata
@@ -58,8 +60,8 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"version", no_argument, 0,  'V'},
-			{"help", no_argument, 0,  'h'},
+			{"version", no_argument, 0, 'V'},
+			{"help", no_argument, 0, 'h'},
 			{0, 0, 0, 0}
 		};
 
@@ -82,7 +84,7 @@ int main(int argc, char *argv[])
 	}
 
 	// Initialise libsigrok
-	if (sr_init() != SR_OK) {
+	if (sr_init(&sr_ctx) != SR_OK) {
 		qDebug() << "ERROR: libsigrok init failed.";
 		return 1;
 	}
@@ -96,7 +98,7 @@ int main(int argc, char *argv[])
 		// Initialize all libsigrok drivers
 		sr_dev_driver **const drivers = sr_driver_list();
 		for (sr_dev_driver **driver = drivers; *driver; driver++) {
-			if (sr_driver_init(*driver) != SR_OK) {
+			if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
 				qDebug("Failed to initialize driver %s",
 					(*driver)->name);
 				ret = 1;
@@ -104,7 +106,7 @@ int main(int argc, char *argv[])
 			}
 		}
 
-		if(ret == 0) {
+		if (ret == 0) {
 			// Initialise the main window
 			pv::MainWindow w;
 			w.show();
@@ -120,7 +122,8 @@ int main(int argc, char *argv[])
 		qDebug() << "ERROR: libsigrokdecode init failed.";
 	}
 
-	sr_exit();
+	if (sr_ctx)
+		sr_exit(sr_ctx);
 
 	return ret;
 }