Changeset 31635 in osm for applications/editors/josm/plugins

Timestamp:

2015-10-15T19:28:31+02:00 (9 years ago)

Author:

niplecrumple

Message:

 

File:

• applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java

@@ -83 +83 @@
                         FiltersDownloader.initFilters();
 
-                        LayerListDialog dialog = Main.map
-                                        .getToggleDialog(LayerListDialog.class);
-
                         if (action == null) {
                                 action = new ShowLayerFiltersDialog();
@@ -97 +94 @@
                                 filterButton.setEnabled(false);
                         }
+
+                        LayerListDialog dialog = LayerListDialog.getInstance();
 
                         JPanel buttonRowPanel = (JPanel) ((JPanel) dialog.getComponent(2))
@@ -123 +122 @@
 
                         Container container = filterButton.getParent();
-                        container.remove(filterButton);
+                        if (container != null)
+                                container.remove(filterButton);
+                        
                         FiltersDownloader.destroyFilters();
                         filterButton = null;