Changeset 4017 in josm

Timestamp:

Apr 6, 2011 3:34:02 PM (2 years ago)

Author:

Upliner

Message:

fix #5834, #5977 TMS context menu comes up after imagery layer(s) deleted

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -435 +435 @@
             @Override
             public void run() {
-                Main.map.mapView.addMouseListener(new MouseAdapter() {
+                final MouseAdapter adapter = new MouseAdapter() {
                     @Override
                     public void mouseClicked(MouseEvent e) {
+                        if (!isVisible()) return;
                         if (e.getButton() == MouseEvent.BUTTON3) {
                             clickedTile = getTileForPixelpos(e.getX(), e.getY());
@@ -466 +467 @@
                         }
                     }
-                });
+                };
+                Main.map.mapView.addMouseListener(adapter);
 
                 MapView.addLayerChangeListener(new LayerChangeListener() {
@@ -481 +483 @@
                     @Override
                     public void layerRemoved(Layer oldLayer) {
-                        MapView.removeLayerChangeListener(this);
+                        if (oldLayer == TMSLayer.this) {
+                            Main.map.mapView.removeMouseListener(adapter);
+                            MapView.removeLayerChangeListener(this);
+                        }
                     }
                 });