diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index 6299f54e7..4800fc5c5 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -25,15 +25,15 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) { slayout = new QStackedLayout(); main_layout->addLayout(slayout); + home = new OffroadHome(); + slayout->addWidget(home); + onroad = new OnroadWindow(this); slayout->addWidget(onroad); QObject::connect(this, &HomeWindow::update, onroad, &OnroadWindow::update); QObject::connect(this, &HomeWindow::offroadTransitionSignal, onroad, &OnroadWindow::offroadTransitionSignal); - home = new OffroadHome(); - slayout->addWidget(home); - driver_view = new DriverViewWindow(this); connect(driver_view, &DriverViewWindow::done, [=] { showDriverView(false); diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index f9b4f2eee..62f621de4 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -134,7 +134,7 @@ static void update_state(UIState *s) { scene.engageable = sm["controlsState"].getControlsState().getEngageable(); scene.dm_active = sm["driverMonitoringState"].getDriverMonitoringState().getIsActiveMode(); } - if (sm.updated("radarState")) { + if (sm.updated("radarState") && s->vg) { std::optional line; if (sm.rcv_frame("modelV2") > 0) { line = sm["modelV2"].getModelV2().getPosition(); @@ -158,7 +158,7 @@ static void update_state(UIState *s) { } } } - if (sm.updated("modelV2")) { + if (sm.updated("modelV2") && s->vg) { update_model(s, sm["modelV2"].getModelV2()); } if (sm.updated("pandaState")) {