fixing NullPointerException in ConfocalSettingsFromSettingRecordsExtr…

…actor.createChannelSettings(..)
ome · Oct 28, 2024 · 105fd8a · 105fd8a
1 parent d3e5abf
commit 105fd8a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...icaMicrosystemsMetadata/extract/confocal/ConfocalSettingsFromSettingRecordsExtractor.java b/...icaMicrosystemsMetadata/extract/confocal/ConfocalSettingsFromSettingRecordsExtractor.java
@@ -170,7 +170,7 @@ private static List<ConfocalChannelSetting> createChannelSettings(List<DetectorS
         LaserSetting selectedLaserSetting = null;
         for (LaserSetting laserSetting : laserSettings) {
           if (laserSetting.wavelength < detectorSetting.cutIn) {
-            if (selectedLaserSetting == null || (laserSetting.laser != null && selectedLaserSetting.laser.wavelength < laserSetting.laser.wavelength))
+            if (selectedLaserSetting == null || (laserSetting.laser != null && selectedLaserSetting.laser != null && selectedLaserSetting.laser.wavelength < laserSetting.laser.wavelength))
               selectedLaserSetting = laserSetting;
           }
         }