Changeset 35980 in osm for applications/editors

Timestamp:

2022-06-16T14:48:53+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22144: NPE when no edit layer exists and remote control is called

File:

• applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (modified) (1 diff)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -142 +142 @@
         this.changesetId = changesetId;
         OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        newLayer = newLayer || editLayer == null;
         if (newLayer) {
             this.ds = new DataSet();
             this.layer = new OsmDataLayer(this.ds, tr("Reverted changeset") + tr(" [id: {0}]", String.valueOf(changesetId)), null);
-            this.ods = ods;
         } else {
             this.layer = editLayer;
             this.ds = editLayer.data;
-            this.ods = ods;
-        }
+        }
+        this.ods = ods;
         this.revertType = revertType;
         if ((revertType == RevertType.SELECTION || revertType == RevertType.SELECTION_WITH_UNDELETE)