From 28a21bcd5aecd4271bcab61ef70dd7f0ca781a1d Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 3 May 2022 22:39:42 -0700 Subject: [PATCH] fix ui hang --- selfdrive/ui/qt/widgets/cameraview.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/widgets/cameraview.cc b/selfdrive/ui/qt/widgets/cameraview.cc index 9cb9e4aa8a..52acae85fa 100644 --- a/selfdrive/ui/qt/widgets/cameraview.cc +++ b/selfdrive/ui/qt/widgets/cameraview.cc @@ -163,7 +163,6 @@ void CameraViewWidget::initializeGL() { void CameraViewWidget::showEvent(QShowEvent *event) { latest_frame = nullptr; - if (!vipc_client) { qDebug() << "Initializing vipc_client"; vipc_client.reset(new VisionIpcClient(stream_name, stream_type, false)); @@ -179,6 +178,7 @@ void CameraViewWidget::showEvent(QShowEvent *event) { } void CameraViewWidget::hideEvent(QHideEvent *event) { + qDebug() << "resetting vipc_client"; vipc_client.reset(); } @@ -285,13 +285,15 @@ void CameraViewWidget::updateCameraFrame() { UIState *s = uiState(); bool recv_one = (meta_main.frame_id - (*s->sm)["modelV2"].getModelV2().getFrameId()) > 5; while (meta_main.frame_id < (*s->sm)["modelV2"].getModelV2().getFrameId() || recv_one) { - recv_one = false; // qDebug() << "Getting buf"; buf = vipc_client->recv(&meta_main, 1000); // qDebug() << "After buf"; +// qDebug() << "camerad:" << meta_main.frame_id << "modeld:" << (*s->sm)["modelV2"].getModelV2().getFrameId(); if (buf == nullptr) { qDebug() << "frame nullptr!"; break; + } else if (recv_one) { + break; } }