Refactor scan options check.

[libsigrok.git] / src / session_file.c

diff --git a/src/session_file.c b/src/session_file.c
index 52d764dc68e88122a7203ccc33a8b14dffb00271..9f8ee75660556dc6cb4b34ca3a23746fed25a945 100644 (file)
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -170,8 +170,9 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                        for (j = 0; keys[j]; j++) {
                                val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
                                if (!strcmp(keys[j], "capturefile")) {
-                                       sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
+                                       sdi = sr_dev_inst_new();
                                        sdi->driver = &session_driver;
+                                       sdi->status = SR_ST_ACTIVE;
                                        if (!session_driver_initialized) {
                                                /* first device, init the driver */
                                                session_driver_initialized = 1;
@@ -179,6 +180,8 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                                        }
                                        sr_dev_open(sdi);
                                        sr_session_dev_add(*session, sdi);
+                                       (*session)->owned_devs = g_slist_append(
+                                                       (*session)->owned_devs, sdi);
                                        sdi->driver->config_set(SR_CONF_SESSIONFILE,
                                                        g_variant_new_string(filename), sdi, NULL);
                                        sdi->driver->config_set(SR_CONF_CAPTUREFILE,