Skip to content

Commit c6cd667

Browse files
committed
Fix TrackMate sometimes crashing with NPE on loading last settings.
The manual tracker factory returns null as for default settings, which cause issues when trying to use this as default to deserialize the last used settings. Noticed by @lxenard
1 parent 66dc17f commit c6cd667

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/main/java/fiji/plugin/trackmate/detection/ManualDetectorFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public boolean has2Dsegmentation()
6565
return true;
6666
}
6767

68-
6968
@Override
7069
public ConfigurationPanel getDetectorConfigurationPanel( final Settings settings, final Model model )
7170
{

src/main/java/fiji/plugin/trackmate/tracking/manual/ManualTrackerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222
package fiji.plugin.trackmate.tracking.manual;
2323

24+
import java.util.Collections;
2425
import java.util.Map;
2526

2627
import javax.swing.ImageIcon;
@@ -92,6 +93,6 @@ public String checkSettings( final Map< String, Object > settings )
9293
@Override
9394
public Map< String, Object > getDefaultSettings()
9495
{
95-
return null;
96+
return Collections.emptyMap();
9697
}
9798
}

0 commit comments

Comments
 (0)