From 84588c072159d89ca937a3024c5ee5d76ff8de82 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Thu, 4 Jan 2024 20:18:15 +0200
Subject: [PATCH] QFileInfoGatherer: simplify logic; use std::exchange

Change-Id: I8e3ccc5e30dd2e08b53fd5dcab66bc921de30538
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/gui/itemmodels/qfileinfogatherer.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gui/itemmodels/qfileinfogatherer.cpp b/src/gui/itemmodels/qfileinfogatherer.cpp
index 5156a3f21f9..88380c42172 100644
--- a/src/gui/itemmodels/qfileinfogatherer.cpp
+++ b/src/gui/itemmodels/qfileinfogatherer.cpp
@@ -263,11 +263,9 @@ void QFileInfoGatherer::setWatching(bool v)
 #if QT_CONFIG(filesystemwatcher)
     QMutexLocker locker(&mutex);
     if (v != m_watching) {
-        if (!v) {
-            delete m_watcher;
-            m_watcher = nullptr;
-        }
         m_watching = v;
+        if (!m_watching)
+            delete std::exchange(m_watcher, nullptr);
     }
 #else
     Q_UNUSED(v);