From 372ae37d91f4113cc9927d27f186789dfa68f568 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 18 Jul 2023 15:52:59 -0700 Subject: [PATCH] nav: show green path when enabled (#29020) * draft * draft * clean up * clean up * cleaner * needs to be here to work * or this works * works too * stash * clean up qdebugs * revert to master * reapply changes add bool * consistent cmts * clean up * can be simpler combined * clean up/fix old-commit-hash: 7a673c87ffd8bac16debd306977d00e0db156360 --- selfdrive/ui/qt/maps/map.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/selfdrive/ui/qt/maps/map.cc b/selfdrive/ui/qt/maps/map.cc index e75cb623f0..02af445e6c 100644 --- a/selfdrive/ui/qt/maps/map.cc +++ b/selfdrive/ui/qt/maps/map.cc @@ -141,7 +141,8 @@ void MapWindow::updateState(const UIState &s) { if (sm.updated("modelV2")) { // set path color on change, and show map on rising edge of navigate on openpilot - bool nav_enabled = sm["modelV2"].getModelV2().getNavEnabled(); + bool nav_enabled = sm["modelV2"].getModelV2().getNavEnabled() && + sm["controlsState"].getControlsState().getEnabled(); if (nav_enabled != uiState()->scene.navigate_on_openpilot) { if (loaded_once) { m_map->setPaintProperty("navLayer", "line-color", getNavPathColor(nav_enabled));