Changes between Initial Version and Version 1 of Ticket #20989

Timestamp:

2021-06-23T12:51:53+02:00 (5 years ago)

Author:

Bjoeni

Comment:

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

  299	299	return new ArrayList<>();
  300	300	}
  301	301
  302		if (layer == activeLayer || layer == osmDataLayer) {
  	302	if (!MainApplication.worker.isShutdown() && (layer == activeLayer || layer == osmDataLayer)) {
  303	303	Layer nextActive = suggestNextActiveLayer(layer);
  304	304	setActiveLayer(nextActive, true);
  305	305	}
  306	306
  307	307	Collection<Layer> toDelete = super.realRemoveSingleLayer(layer);
  308		if (getLayers().isEmpty()) {
  	308	if (!MainApplication.worker.isShutdown() && getLayers().isEmpty()) {
  309	309	LayerAvailabilityEvent e = new LayerAvailabilityEvent(this, false);
  310	310	for (LayerAvailabilityListener l : layerAvailabilityListeners) {
  311	311	l.afterLastLayerRemoved(e);

The problem is that the LayerManager attempts to set a new active layer when another (currently active) layer is removed - even when exiting JOSM. This will cause issues, since the MainApplication.worker is already shutdown at that point. It could also be fixed by shutting down the worker after removing all layers, but I think it's anyways pointless to set a new active layer during shutdown. (The layerRemoving event required e.g. by the AutoSaveTask will still be fired.)

Also, turns out it's not related to #20871.