From 93ddc48956fd8ce2f0909bd108066b2eac92787e Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 21 Jul 2022 08:52:49 +0200
Subject: [PATCH] EnvironmentAspectWidget: Use Utils::Guard

Change-Id: I4093133e87ecbca78e9cbde6c10e7aaf10ac0480
Reviewed-by: hjk <hjk@qt.io>
---
 .../projectexplorer/environmentaspectwidget.cpp      | 12 +++++-------
 .../projectexplorer/environmentaspectwidget.h        |  3 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/plugins/projectexplorer/environmentaspectwidget.cpp b/src/plugins/projectexplorer/environmentaspectwidget.cpp
index 4f69c4377e1..2f48a677533 100644
--- a/src/plugins/projectexplorer/environmentaspectwidget.cpp
+++ b/src/plugins/projectexplorer/environmentaspectwidget.cpp
@@ -96,16 +96,15 @@ void EnvironmentAspectWidget::addWidget(QWidget *widget)
 
 void EnvironmentAspectWidget::baseEnvironmentSelected(int idx)
 {
-    m_ignoreChange = true;
+    const Utils::GuardLocker locker(m_ignoreChanges);
     m_aspect->setBaseEnvironmentBase(idx);
     m_environmentWidget->setBaseEnvironment(m_aspect->modifiedBaseEnvironment());
     m_environmentWidget->setBaseEnvironmentText(m_aspect->currentDisplayName());
-    m_ignoreChange = false;
 }
 
 void EnvironmentAspectWidget::changeBaseEnvironment()
 {
-    if (m_ignoreChange)
+    if (m_ignoreChanges.isLocked())
         return;
 
     int base = m_aspect->baseEnvironmentBase();
@@ -119,21 +118,20 @@ void EnvironmentAspectWidget::changeBaseEnvironment()
 
 void EnvironmentAspectWidget::userChangesEdited()
 {
-    m_ignoreChange = true;
+    const Utils::GuardLocker locker(m_ignoreChanges);
     m_aspect->setUserEnvironmentChanges(m_environmentWidget->userChanges());
-    m_ignoreChange = false;
 }
 
 void EnvironmentAspectWidget::changeUserChanges(Utils::EnvironmentItems changes)
 {
-    if (m_ignoreChange)
+    if (m_ignoreChanges.isLocked())
         return;
     m_environmentWidget->setUserChanges(changes);
 }
 
 void EnvironmentAspectWidget::environmentChanged()
 {
-    if (m_ignoreChange)
+    if (m_ignoreChanges.isLocked())
         return;
     m_environmentWidget->setBaseEnvironment(m_aspect->modifiedBaseEnvironment());
 }
diff --git a/src/plugins/projectexplorer/environmentaspectwidget.h b/src/plugins/projectexplorer/environmentaspectwidget.h
index 9c30c373c7a..bdfacb3012a 100644
--- a/src/plugins/projectexplorer/environmentaspectwidget.h
+++ b/src/plugins/projectexplorer/environmentaspectwidget.h
@@ -31,6 +31,7 @@
 #include "runconfiguration.h"
 
 #include <utils/environment.h>
+#include <utils/guard.h>
 
 #include <QList>
 #include <QVariantMap>
@@ -66,7 +67,7 @@ private:
     void environmentChanged();
 
     EnvironmentAspect *m_aspect;
-    bool m_ignoreChange = false;
+    Utils::Guard m_ignoreChanges;
     QHBoxLayout *m_baseLayout = nullptr;
     QComboBox *m_baseEnvironmentComboBox = nullptr;
     EnvironmentWidget *m_environmentWidget = nullptr;