Don't crash if the saved tracker is unknown to us.

trackmate-sc · Jul 22, 2024 · 19e981a · 19e981a
1 parent b2207c1
commit 19e981a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/fiji/plugin/trackmate/gui/wizard/TrackMateWizardSequence.java b/src/main/java/fiji/plugin/trackmate/gui/wizard/TrackMateWizardSequence.java
@@ -396,7 +396,7 @@ private SpotTrackerDescriptor getTrackerConfigDescriptor()
 		 * Special case: are we dealing with the manual tracker? If yes, no
 		 * config, no detection.
 		 */
-		if ( trackerFactory.getKey().equals( ManualTrackerFactory.TRACKER_KEY ) )
+		if ( trackerFactory == null || trackerFactory.getKey().equals( ManualTrackerFactory.TRACKER_KEY ) )
 		{
 			// Position sequence next and previous.
 			next.put( chooseTrackerDescriptor, trackFilterDescriptor );

diff --git a/src/main/java/fiji/plugin/trackmate/gui/wizard/WizardController.java b/src/main/java/fiji/plugin/trackmate/gui/wizard/WizardController.java
@@ -204,7 +204,13 @@ private void exec( final Runnable runnable )
 
 	public void init()
 	{
-		final WizardPanelDescriptor descriptor = sequence.current();
+		WizardPanelDescriptor descriptor = sequence.current();
+		if ( descriptor == null )
+		{
+			sequence.setCurrent( sequence.configDescriptor().panelIdentifier );
+			descriptor = sequence.configDescriptor();
+		}
+
 		wizardPanel.btnPrevious.setEnabled( sequence.hasPrevious() );
 		wizardPanel.btnNext.setEnabled( sequence.hasNext() );
 		descriptor.aboutToDisplayPanel();