Changeset 5758 in josm for trunk


Ignore:
Timestamp:
2013-03-06T22:23:19+01:00 (7 years ago)
Author:
Don-vip
Message:

fix #6630 - NPE when merging data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r5519 r5758  
    407407        }
    408408        // repaint to make sure new data is displayed properly.
    409         Main.map.mapView.repaint();
     409        if (Main.map != null && Main.map.mapView != null) {
     410            Main.map.mapView.repaint();
     411        }
    410412        warnNumNewConflicts(numNewConflicts);
    411413    }
Note: See TracChangeset for help on using the changeset viewer.