Changeset 13795 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2018-05-20T22:02:51+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
r13761 r13795 127 127 private void doExitMode() { 128 128 exitingMode = true; 129 super.exitMode(); 129 try { 130 super.exitMode(); 131 } catch (IllegalArgumentException e) { 132 Logging.trace(e); 133 } 130 134 if (offsetDialog != null) { 131 135 if (layer != null) { -
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r13265 r13795 471 471 */ 472 472 public boolean selectMapMode(MapMode newMapMode, Layer newLayer) { 473 if (newMapMode == null || !newMapMode.layerIsSupported(newLayer))474 return false;475 476 473 MapMode oldMapMode = this.mapMode; 477 474 if (newMapMode == oldMapMode) 478 475 return true; 476 if (newMapMode == null || !newMapMode.layerIsSupported(newLayer)) { 477 newMapMode = null; 478 } 479 479 480 if (oldMapMode != null) { 480 481 oldMapMode.exitMode(); 481 482 } 482 483 this.mapMode = newMapMode; 483 newMapMode.enterMode(); 484 if (newMapMode != null) { 485 newMapMode.enterMode(); 486 } 484 487 lastMapMode.put(newLayer, newMapMode); 485 488 fireMapModeChanged(oldMapMode, newMapMode); 486 return true;489 return newMapMode != null; 487 490 } 488 491
Note:
See TracChangeset
for help on using the changeset viewer.