From 2eb9338be0a30572a07c92ac9a59613383fdc055 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Thu, 2 Feb 2023 12:53:57 +0100
Subject: [PATCH] CMakePM: fix presets sort assert with MSVC in debug mode

Amends 9deef74d9ed1ac83664c138ec2ada88a1dc4c061

Change-Id: Id4e7fcbfa6bdc8ac65afc2c93510e8389d7e7fe4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakeproject.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index d4e45d1d464..829c28be152 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -98,10 +98,8 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
 
         auto resolveInherits = [](auto &presetsHash, auto &presetsList) {
             Utils::sort(presetsList, [](const auto &left, const auto &right) {
-                if (left.inherits) {
-                    if (left.inherits.value().contains(right.name))
-                        return false;
-                }
+                if (!left.inherits || left.inherits.value().contains(right.name))
+                    return false;
                 return true;
             });
             for (auto &p : presetsList) {