Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 16290)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 16409)
@@ -37,5 +37,5 @@
                 <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Surveyor"/>
-                <attribute name="Plugin-Mainversion" value="1722"/>
+                <attribute name="Plugin-Mainversion" value="1755"/>
                 <attribute name="Plugin-Requires" value="livegps"/>
                 <attribute name="Plugin-Stage" value="60"/>
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 16290)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 16409)
@@ -39,8 +39,8 @@
     @Override
     public void run() {
-        if(Main.map == null || Main.map.mapView == null || Main.map.mapView.editLayer == null) {
+        if(Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) {
             return;
         }
-        OsmDataLayer layer = Main.map.mapView.editLayer;
+        OsmDataLayer layer = Main.map.mapView.getEditLayer();
         try {
             DataSet dataset = layer.data;
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 16290)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 16409)
@@ -70,5 +70,5 @@
         node.put("created_by", "JOSM-surveyor-plugin");
         synchronized(LiveGpsLock.class) {
-            Main.main.editLayer().data.nodes.add(node);
+            Main.map.mapView.getEditLayer().data.nodes.add(node);
             Main.ds.setSelected(node);
         }