Changeset 10150 in josm for trunk/src

Timestamp:

2016-04-17T23:20:08+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12755 - NPE

File:

• trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -295 +295 @@
         public void setVisible(boolean visible) {
             super.setVisible(visible);
-            if (visible) return;
+            if (visible)
+                return;
             offsetDialog = null;
-            if (getValue() != 1) {
-                layer.setOffset(oldDx, oldDy);
-            } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
-                OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);
+            if (layer != null) {
+                if (getValue() != 1) {
+                    layer.setOffset(oldDx, oldDy);
+                } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
+                    OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);
+                }
             }
             Main.main.menu.imageryMenu.refreshOffsetMenu();
-            if (Main.map == null) return;
+            if (Main.map == null)
+                return;
             if (oldMapMode != null) {
                 Main.map.selectMapMode(oldMapMode);