From fb6218cd290e33cb4c88cfae36e5824d8014d6c6 Mon Sep 17 00:00:00 2001 From: devnull Date: Tue, 9 May 2023 22:09:18 -0400 Subject: [PATCH] Review updates for multi-file tool support 5 - Fix premature MergeTool deletion. --- src/tools/MergeTool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/MergeTool.cpp b/src/tools/MergeTool.cpp index a185c7605..755665ee6 100644 --- a/src/tools/MergeTool.cpp +++ b/src/tools/MergeTool.cpp @@ -121,7 +121,7 @@ bool MergeTool::start() { repo.index().setStaged({fileMerge.name.mid(length + 1)}, true); } - if (--numMergeFiles) { + if (--numMergeFiles == 0) { deleteLater(); } });