From be958c409f452108e49de7e30220ec5d50aaed62 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 10 Dec 2023 13:18:47 +0100 Subject: [PATCH] recorder: Fix error reading multiple recorders from .bam file Modified version of #1564 without changing ABI Fixes #1561 --- panda/src/recorder/mouseRecorder.cxx | 6 ++---- panda/src/recorder/socketStreamRecorder.cxx | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/panda/src/recorder/mouseRecorder.cxx b/panda/src/recorder/mouseRecorder.cxx index 37a5a2a440..a851d26125 100644 --- a/panda/src/recorder/mouseRecorder.cxx +++ b/panda/src/recorder/mouseRecorder.cxx @@ -228,11 +228,9 @@ make_from_bam(const FactoryParams ¶ms) { RecorderBase *MouseRecorder:: make_recorder(const FactoryParams ¶ms) { MouseRecorder *node = new MouseRecorder(""); - DatagramIterator scan; - BamReader *manager; + BamReaderParam *param = DCAST(BamReaderParam, params.get_param(0)); - parse_params(params, scan, manager); - node->fillin_recorder(scan, manager); + node->fillin_recorder((DatagramIterator &)param->get_iterator(), param->get_manager()); return node; } diff --git a/panda/src/recorder/socketStreamRecorder.cxx b/panda/src/recorder/socketStreamRecorder.cxx index 8418485b20..6499805e4d 100644 --- a/panda/src/recorder/socketStreamRecorder.cxx +++ b/panda/src/recorder/socketStreamRecorder.cxx @@ -113,11 +113,9 @@ write_recorder(BamWriter *manager, Datagram &dg) { RecorderBase *SocketStreamRecorder:: make_recorder(const FactoryParams ¶ms) { SocketStreamRecorder *node = new SocketStreamRecorder; - DatagramIterator scan; - BamReader *manager; + BamReaderParam *param = DCAST(BamReaderParam, params.get_param(0)); - parse_params(params, scan, manager); - node->fillin_recorder(scan, manager); + node->fillin_recorder((DatagramIterator &)param->get_iterator(), param->get_manager()); return node; }