rigol-ds: Fix wrong channel group malloc size.

[libsigrok.git] / src / session_file.c

diff --git a/src/session_file.c b/src/session_file.c
index 26c0df7a3d88806b65e617f25815e86bbc0e66e7..29f26ee2e4dd895e387a5bdf1afcb56c2803ac6c 100644 (file)
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -212,19 +212,19 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                                                        g_variant_new_uint64(total_channels), sdi, NULL);
                                        for (p = 0; p < total_channels; p++) {
                                                snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
-                                               ch = sr_channel_new(p, SR_CHANNEL_LOGIC, FALSE,
+                                               sr_channel_new(sdi, p, SR_CHANNEL_LOGIC, FALSE,
                                                                channelname);
-                                               sdi->channels = g_slist_append(sdi->channels, ch);
                                        }
                                } else if (!strncmp(keys[j], "probe", 5)) {
                                        if (!sdi) {
                                                ret = SR_ERR_DATA;
                                                break;
                                        }
-                                       tmp_u64 = strtoul(keys[j]+5, NULL, 10);
+                                       tmp_u64 = strtoul(keys[j]+5, NULL, 10) - 1;
+                                       ch = g_slist_nth_data(sdi->channels, tmp_u64);
                                        /* sr_session_save() */
-                                       sr_dev_channel_name_set(sdi, tmp_u64 - 1, val);
-                                       sr_dev_channel_enable(sdi, tmp_u64 - 1, TRUE);
+                                       sr_dev_channel_name_set(ch, val);
+                                       sr_dev_channel_enable(ch, TRUE);
                                }
                        }
                        g_strfreev(keys);