Changeset 7534 in josm for trunk/src/org/openstreetmap/josm/actions/JosmAction.java
- Timestamp:
- 2014-09-14T17:11:14+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r6890 r7534 84 84 putValue("toolbar", toolbarId); 85 85 } 86 if (registerInToolbar ) {86 if (registerInToolbar && Main.toolbar != null) { 87 87 Main.toolbar.register(this); 88 88 } … … 205 205 */ 206 206 protected static OsmDataLayer getEditLayer() { 207 return Main.main .getEditLayer();207 return Main.main != null ? Main.main.getEditLayer() : null; 208 208 } 209 209 … … 214 214 */ 215 215 protected static DataSet getCurrentDataSet() { 216 return Main.main .getCurrentDataSet();216 return Main.main != null ? Main.main.getCurrentDataSet() : null; 217 217 } 218 218
Note:
See TracChangeset
for help on using the changeset viewer.