From b237984d8fba20f698e3f90c07d3b2e0bfce6c2b Mon Sep 17 00:00:00 2001 From: Paolo Nesti Poggi Date: Mon, 16 Oct 2017 21:37:20 +0200 Subject: [PATCH] Fixed issue #3086: merge-doc.js: Merge document in word >=2010 leaves three open windows Signed-off-by: Sven Strickroth --- contrib/diff-scripts/merge-doc.js | 1 + src/Changelog.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/contrib/diff-scripts/merge-doc.js b/contrib/diff-scripts/merge-doc.js index f4e664f07..144c99ce1 100644 --- a/contrib/diff-scripts/merge-doc.js +++ b/contrib/diff-scripts/merge-doc.js @@ -106,6 +106,7 @@ else myDoc.Activate(); //required? just in case myDoc.Merge(sTheirDoc, wdMergeTargetCurrent); + theirDoc.close(); // bring focus to the window, for accept/reject buttons to be active. WSHShell.AppActivate(word.windows.Item(1).caption); diff --git a/src/Changelog.txt b/src/Changelog.txt index 58f19ec07..480452f95 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -20,6 +20,7 @@ Released: unreleased * Fixed issue #3090: Show Log window stuck with "Fetching changed files..." * Fixed issue #3084: Improve info message for merge-doc.js and drop broken URL * Fixed issue #3085: merge-doc.js: Word 2007 does not make a three-way comparison and the documents are shown in wrong order + * Fixed issue #3086: merge-doc.js: Merge document in word >=2010 leaves three open windows = Release 2.5.0 = Released: 2017-07-23 -- 2.11.4.GIT