From c0770313f349c8d92e127feb9925c4413a2c0c83 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 25 Jun 2020 11:19:15 +0200
Subject: [PATCH] CMake: Fix changing build directory

It wasn't possible to change the build directory if the old directory
didn't already contain a build.

Amends 7e6e02eb0852837ba0f2c3aec445916b8403f1c2

Change-Id: I741f6981273a4e04cceabde5b15b5ad951535ef8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index f52cf7c28fc..8ebbc3d21c8 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -121,8 +121,9 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Core::Id id)
                     == QMessageBox::Ok) {
                     return newDir;
                 }
+                return Utils::nullopt;
             }
-            return Utils::nullopt;
+            return newDir;
         });
 
     addAspect<InitialCMakeArgumentsAspect>();