mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-04 04:52:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: fix memory leak in MapSettings (#28759)

Browse Source 
Co-authored-by: Cameron Clough <cameronjclough@gmail.com>

old-commit-hash: 93413c43df594a63b36c896c629daaef27dd9fe4
This commit is contained in:
Dean Lee
2023-07-01 16:45:05 +08:00
committed by GitHub
parent 38be68ff5e
commit c49d605320
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/maps/map_settings.cc
+12 -12
View File
@@ -131,12 +131,12 @@ void MapSettings::updateCurrentRoute() {
qWarning() << "JSON Parse failed on NavDestination" << dest;
return;
}
auto destination = new NavDestination(doc.object());
auto destination = std::make_unique<NavDestination>(doc.object());
if (current_destination && *destination == *current_destination) return;
current_destination = destination;
current_widget->set(current_destination, true);
current_destination = std::move(destination);
current_widget->set(current_destination.get(), true);
} else {
current_destination = nullptr;
current_destination.reset(nullptr);
current_widget->unset("", true);
}
if (isVisible()) refresh();
@@ -150,7 +150,7 @@ void MapSettings::parseResponse(const QString &response, bool success) {
void MapSettings::refresh() {
bool has_home = false, has_work = false;
auto destinations = std::vector<NavDestination*>();
auto destinations = std::vector<std::unique_ptr<NavDestination>>();
auto destinations_str = cur_destinations.trimmed();
if (!destinations_str.isEmpty()) {
@@ -161,7 +161,7 @@ void MapSettings::refresh() {
}
for (auto el : doc.array()) {
auto destination = new NavDestination(el.toObject());
auto destination = std::make_unique<NavDestination>(el.toObject());
// add home and work later if they are missing
if (destination->isFavorite()) {
@@ -171,7 +171,7 @@ void MapSettings::refresh() {
// skip current destination
if (current_destination && *destination == *current_destination) continue;
destinations.push_back(destination);
destinations.push_back(std::move(destination));
}
}
@@ -179,7 +179,7 @@ void MapSettings::refresh() {
clearLayout(destinations_layout);
// Sort: HOME, WORK, and then descending-alphabetical FAVORITES, RECENTS
std::sort(destinations.begin(), destinations.end(), [](const NavDestination *a, const NavDestination *b) {
std::sort(destinations.begin(), destinations.end(), [](const auto &a, const auto &b) {
if (a->isFavorite() && b->isFavorite()) {
if (a->label() == NAV_FAVORITE_LABEL_HOME) return true;
else if (b->label() == NAV_FAVORITE_LABEL_HOME) return false;
@@ -192,12 +192,12 @@ void MapSettings::refresh() {
return a->name() < b->name();
});
for (auto destination : destinations) {
for (auto &destination : destinations) {
auto widget = new DestinationWidget(this);
widget->set(destination, false);
widget->set(destination.get(), false);
QObject::connect(widget, &QPushButton::clicked, [=]() {
navigateTo(destination->toJson());
QObject::connect(widget, &QPushButton::clicked, [this, dest = destination->toJson()]() {
navigateTo(dest);
emit closeSettings();
});
selfdrive/ui/qt/maps/map_settings.h
+3 -1
View File
@@ -1,5 +1,7 @@
#pragma once
#include <memory>
#include <QFrame>
#include <QJsonArray>
#include <QJsonDocument>
@@ -37,7 +39,7 @@ private:
Params params;
QString cur_destinations;
QVBoxLayout *destinations_layout;
NavDestination *current_destination;
std::unique_ptr<NavDestination> current_destination;
DestinationWidget *current_widget;
QPixmap close_icon;