kopia lustrzana https://github.com/JOSM/MapWithAI
Fix possible possible NPE with merging duplicate ways
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>pull/1/head
rodzic
7b662bbfdf
commit
6c0d8ae241
|
@ -66,6 +66,8 @@ public class MergeDuplicateWays extends Command {
|
||||||
filterDataSet(getAffectedDataSet(), commands);
|
filterDataSet(getAffectedDataSet(), commands);
|
||||||
} else if (way1 != null && way2 == null) {
|
} else if (way1 != null && way2 == null) {
|
||||||
checkForDuplicateWays(way1, commands);
|
checkForDuplicateWays(way1, commands);
|
||||||
|
} else if (way1 == null) {
|
||||||
|
checkForDuplicateWays(way2, commands);
|
||||||
} else {
|
} else {
|
||||||
Command command = checkForDuplicateWays(way1, way2);
|
Command command = checkForDuplicateWays(way1, way2);
|
||||||
if (command != null) {
|
if (command != null) {
|
||||||
|
|
Ładowanie…
Reference in New Issue