fix #24121, fix null access

stoecker · stoecker · commit 4e00d13d4978 · 2025-02-06T22:14:50.000Z
git-svn-id: https://josm.openstreetmap.de/svn/trunk@19311 0c6e7542-c601-0410-84e7-c038aed88b3b
diff --git a/src/org/openstreetmap/josm/gui/bbox/SourceButton.java b/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
@@ -81,7 +81,8 @@ protected void generatePopupMenu() {
             this.sourceButtonGroup.add(menuItem);
 
             // attempt to initialize button group matching current state of slippyMapBBoxChooser
-            buttonModel.setSelected(this.slippyMapBBoxChooser.getTileController().getTileSource().getId().equals(ts.getId()));
+            String tsid = this.slippyMapBBoxChooser.getTileController().getTileSource().getId();
+            buttonModel.setSelected(tsid != null && tsid.equals(ts.getId()));
         }
 
         pm.addSeparator();

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ protected void generatePopupMenu() {`
`81`	`81`	`this.sourceButtonGroup.add(menuItem);`
`82`	`82`
`83`	`83`	`// attempt to initialize button group matching current state of slippyMapBBoxChooser`
`84`		`- buttonModel.setSelected(this.slippyMapBBoxChooser.getTileController().getTileSource().getId().equals(ts.getId()));`
	`84`	`+ String tsid = this.slippyMapBBoxChooser.getTileController().getTileSource().getId();`
	`85`	`+ buttonModel.setSelected(tsid != null && tsid.equals(ts.getId()));`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`pm.addSeparator();`