Changeset 9482 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

Timestamp:

2016-01-16T10:43:07+01:00 (8 years ago)

Author:

simon04

Message:

see #12338 fix #12381 - AssertionError on "Resolve to their versions"

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -921 +921 @@
         if (!model.isFrozen()) {
             model.copyAll(MergeDecisionType.KEEP_MINE.equals(decision) ? ListRole.MY_ENTRIES : ListRole.THEIR_ENTRIES);
+            model.setFrozen(true);
         }
     }