From dba3eb7a50fdaaafbed793518feb8f975f3e748b Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 25 May 2023 12:48:59 -0400
Subject: [PATCH] fix upstream conflict

---
 selfdrive/ui/qt/maps/map_settings.cc | 2 +-
 selfdrive/ui/qt/onroad.cc            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/selfdrive/ui/qt/maps/map_settings.cc b/selfdrive/ui/qt/maps/map_settings.cc
index 793e55ac89..8936226e77 100644
--- a/selfdrive/ui/qt/maps/map_settings.cc
+++ b/selfdrive/ui/qt/maps/map_settings.cc
@@ -119,7 +119,7 @@ MapPanel::MapPanel(QWidget* parent) : QWidget(parent) {
     stack->addWidget(no_prime_widget);
   }
   connect(uiState(), &UIState::primeTypeChanged, [=](int prime_type) {
-    stack->setCurrentIndex(!custom_mapbox ? uiState()->prime_type ? 0 : 1 : 1);
+    stack->setCurrentIndex(!custom_mapbox ? uiState()->primeType() ? 0 : 1 : 1);
   });
 
   QVBoxLayout *wrapper = new QVBoxLayout(this);
diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index 792a1eb817..4e2cd7a82a 100644
--- a/selfdrive/ui/qt/onroad.cc
+++ b/selfdrive/ui/qt/onroad.cc
@@ -1397,7 +1397,6 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
 
   // paint path
   QLinearGradient bg(0, height(), 0, height() / 4);
-  float start_hue, end_hue;
   if (madsEnabled) {
     if (steerOverride && latActive) {
       bg.setColorAt(0.0, QColor::fromHslF(20 / 360., 0.94, 0.51, 0.17));