From fe6295dbb7bad74d650f4833888b850d3ae07e76 Mon Sep 17 00:00:00 2001 From: Anton Rudomaneko Date: Thu, 28 Apr 2022 12:30:02 +0300 Subject: [PATCH 1/2] fix: fix the problem with replay routes locally --- selfdrive/ui/replay/route.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/selfdrive/ui/replay/route.cc b/selfdrive/ui/replay/route.cc index 50ccc6156bbc1f..ad93263ae9d55b 100644 --- a/selfdrive/ui/replay/route.cc +++ b/selfdrive/ui/replay/route.cc @@ -77,7 +77,11 @@ bool Route::loadFromLocal() { } void Route::addFileToSegment(int n, const QString &file) { - const QString name = QUrl(file).fileName(); + QString name = QUrl(file).fileName(); + + const int pos = name.lastIndexOf("--"); + name = pos != -1 ? name.mid(pos + 2) : name; + if (name == "rlog.bz2") { segments_[n].rlog = file; } else if (name == "qlog.bz2") { From 93282d4edf1ba11980e8da893d124e6cdf839e41 Mon Sep 17 00:00:00 2001 From: Anton Rudomaneko Date: Tue, 21 Jun 2022 15:47:15 +0300 Subject: [PATCH 2/2] fix: Exception with --allow flag in replay.cc --- selfdrive/ui/replay/replay.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/selfdrive/ui/replay/replay.cc b/selfdrive/ui/replay/replay.cc index 5eb7469c92b37e..cf7520b361b236 100644 --- a/selfdrive/ui/replay/replay.cc +++ b/selfdrive/ui/replay/replay.cc @@ -360,7 +360,8 @@ void Replay::stream() { setCurrentSegment(toSeconds(cur_mono_time_) / 60); // migration for pandaState -> pandaStates to keep UI working for old segments - if (cur_which == cereal::Event::Which::PANDA_STATE_D_E_P_R_E_C_A_T_E_D) { + if (cur_which == cereal::Event::Which::PANDA_STATE_D_E_P_R_E_C_A_T_E_D && + sockets_[cereal::Event::Which::PANDA_STATES] != nullptr) { MessageBuilder msg; auto ps = msg.initEvent().initPandaStates(1); ps[0].setIgnitionLine(true);