Skip to content

Commit a933c07

Browse files
committed
Kill the updater and animator thread when closing the GUI.
1 parent 615e383 commit a933c07

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/main/java/fiji/plugin/trackmate/gui/components/FilterGuiPanel.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import fiji.plugin.trackmate.Model;
6161
import fiji.plugin.trackmate.Settings;
6262
import fiji.plugin.trackmate.features.FeatureFilter;
63+
import fiji.plugin.trackmate.gui.GuiUtils;
6364
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings.TrackMateObject;
6465
import fiji.plugin.trackmate.util.OnRequestUpdater;
6566

@@ -208,7 +209,9 @@ public FilterGuiPanel(
208209

209210
lblTop.setVisible( false ); // For now
210211
logger = new ProgressBarLogger();
211-
212+
213+
// On close
214+
GuiUtils.addOnClosingEvent( this, () -> updater.quit() );
212215
}
213216

214217
/*

src/main/java/fiji/plugin/trackmate/gui/wizard/WizardPanel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import javax.swing.JToggleButton;
3737
import javax.swing.border.EmptyBorder;
3838

39+
import fiji.plugin.trackmate.gui.GuiUtils;
3940
import fiji.plugin.trackmate.gui.wizard.TransitionAnimator.Direction;
4041
import net.imglib2.ui.PainterThread;
4142
import net.imglib2.ui.PainterThread.Paintable;
@@ -146,6 +147,8 @@ public AnimatorPanel()
146147
add( label );
147148
this.painterThread = new PainterThread( this );
148149
painterThread.start();
150+
151+
GuiUtils.addOnClosingEvent( this, () -> animatorPanel.painterThread.interrupt() );
149152
}
150153

151154
public void start( final WizardPanelDescriptor from, final WizardPanelDescriptor to, final Direction direction )

0 commit comments

Comments
 (0)