From fc194e0f172e539e8068bd393360e3dc6cb36e0e Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 23 Jun 2023 22:16:12 -0500 Subject: [PATCH] Don't display a requested product if a different product has since been selected --- scwx-qt/source/scwx/qt/map/map_widget.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp index fc92c3fa..595bea03 100644 --- a/scwx-qt/source/scwx/qt/map/map_widget.cpp +++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp @@ -929,12 +929,18 @@ void MapWidgetImpl::RadarProductManagerConnect() request.get(), &request::NexradFileRequest::RequestComplete, this, - [this](std::shared_ptr request) + [=, + this](std::shared_ptr request) { // Select loaded record auto record = request->radar_product_record(); - if (record != nullptr) + // Validate record, and verify current map context still + // displays product + if (record != nullptr && + context_->radar_product_group() == group && + (group == common::RadarProductGroup::Level2 || + context_->radar_product() == product)) { widget_->SelectRadarProduct(record); }