From 3b19cc32fde7b73bd61a7d9a09348cbe69235607 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 5 Feb 2020 16:16:50 -0500
Subject: [PATCH] Don't grey out the map during conflict resolution (close
 #6547)

---
 modules/modes/save.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/modes/save.js b/modules/modes/save.js
index b80dc30c1..28a299b10 100644
--- a/modules/modes/save.js
+++ b/modules/modes/save.js
@@ -357,15 +357,24 @@ export function modeSave(context) {
         loading.close();
         _isSaving = false;
 
+        context.container().selectAll('#content')
+            .attr('class', 'active');
+
         var ui = uiConflicts(context)
             .conflictList(_conflicts)
             .origChanges(_origChanges)
             .on('cancel', function() {
+                context.container().selectAll('#content')
+                    .attr('class', 'inactive');
+
                 history.pop();
                 selection.remove();
                 keybindingOn();
             })
             .on('save', function() {
+                context.container().selectAll('#content')
+                    .attr('class', 'inactive');
+
                 for (var i = 0; i < _conflicts.length; i++) {
                     if (_conflicts[i].chosen === 1) {  // user chose "keep theirs"
                         var entity = context.hasEntity(_conflicts[i].id);