Merge "RCFilters: Prevent live update fetch if model is in conflict"

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index b489f4e..30bec87 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -540,6 +540,7 @@
                        new mw.Uri().query.liveupdate;
 
                return !document.hidden &&
+                       !this.filtersModel.hasConflict() &&
                        !this.changesListModel.getNewChangesExist() &&
                        !this.updatingChangesList &&
                        liveUpdateFeatureFlag;