From 4e00d13d4978e611ab0e7b23a5f0e210f60a0864 Mon Sep 17 00:00:00 2001
From: stoecker <stoecker@0c6e7542-c601-0410-84e7-c038aed88b3b>
Date: Thu, 6 Feb 2025 22:14:50 +0000
Subject: [PATCH] fix #24121, fix null access

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19311 0c6e7542-c601-0410-84e7-c038aed88b3b
---
 src/org/openstreetmap/josm/gui/bbox/SourceButton.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/openstreetmap/josm/gui/bbox/SourceButton.java b/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
index 9a59d3e3140..80d234de948 100644
--- 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();