Changeset 14156 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2018-08-14T21:01:27+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #16615 - make sure dataset can be garbage collected after removal (regression from r13926)

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r14153 r14156  
    222222    public void exitMode() {
    223223        super.exitMode();
     224        cycleManager.cycleStart = null;
     225        cycleManager.cycleList = asColl(null);
    224226        selectionManager.unregister(mv);
    225227        mv.removeMouseListener(this);

  • trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

    r14153 r14156  
    251251        activeLayer = layer;
    252252        if (activeLayer instanceof AbstractOsmDataLayer) {
    253             dataLayer = (AbstractOsmDataLayer) layer;
     253            dataLayer = (AbstractOsmDataLayer) activeLayer;
     254        } else if (forceEditLayerUpdate) {
     255            dataLayer = null;
    254256        }
    255257        if (activeLayer instanceof OsmDataLayer) {
Note: See TracChangeset for help on using the changeset viewer.