Merge pull request micro-manager#2390 from nicost/multiMDA

nicost · web-flow · commit 1459fd49e7c5 · 2026-06-10T11:33:07.000-07:00
Studio: Avoid NPE in the MultiMDAFrame dialog.
diff --git a/mmstudio/src/main/java/org/micromanager/acquisition/internal/acqengjcompat/multimda/MultiMDAFrame.java b/mmstudio/src/main/java/org/micromanager/acquisition/internal/acqengjcompat/multimda/MultiMDAFrame.java
@@ -349,7 +349,8 @@ private int adjustNrSettings(int nr) {
          acqPanel_.add(presetCombo, "gapx 20");
 
          String positionListText = "current position";
-         if (acqs_.get(lineNr).getPositionList() != null) {
+         if (acqs_.get(lineNr).getPositionList() != null
+               && acqs_.get(lineNr).getPositionListFile() != null) {
             positionListText = acqs_.get(lineNr).getPositionListFile().getName();
          }
          final JLabelC positionListLabel = new JLabelC(positionListText);

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,8 @@ private int adjustNrSettings(int nr) {`
`349`	`349`	`acqPanel_.add(presetCombo, "gapx 20");`
`350`	`350`
`351`	`351`	`String positionListText = "current position";`
`352`		`- if (acqs_.get(lineNr).getPositionList() != null) {`
	`352`	`+ if (acqs_.get(lineNr).getPositionList() != null`
	`353`	`+ && acqs_.get(lineNr).getPositionListFile() != null) {`
`353`	`354`	`positionListText = acqs_.get(lineNr).getPositionListFile().getName();`
`354`	`355`	`}`
`355`	`356`	`final JLabelC positionListLabel = new JLabelC(positionListText);`