Changeset 13433 in josm for trunk


Ignore:
Timestamp:
2018-02-17T18:15:47+01:00 (17 months ago)
Author:
Don-vip
Message:

fix #15849, see #15716 - IAE when changing active layer while setting offset

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

    r13287 r13433  
    5252    private transient AbstractTileSourceLayer<?> layer;
    5353    private MapMode oldMapMode;
     54    private boolean exitingMode;
    5455
    5556    /**
     
    112113    @Override
    113114    public void exitMode() {
     115        exitingMode = true;
    114116        super.exitMode();
    115117        if (offsetDialog != null) {
     
    121123        }
    122124        removeListeners();
     125        exitingMode = false;
    123126    }
    124127
     
    351354                map.selectMapMode(oldMapMode);
    352355                oldMapMode = null;
    353             } else if (!map.selectSelectTool(false)) {
     356            } else if (!exitingMode && !map.selectSelectTool(false)) {
    354357                exitMode();
    355358                map.mapMode = null;
Note: See TracChangeset for help on using the changeset viewer.