diff --git a/pom.xml b/pom.xml
index 93a75f15..d8b08c5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,9 @@
- 11
- 11
+
+ 11
UTF-8
@@ -149,69 +150,134 @@
+
org.apache.maven.plugins
- maven-source-plugin
- 3.2.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.2.0
-
-
- attach-javadocs
-
- jar
-
-
-
+ maven-compiler-plugin
+ 3.15.0
+
org.apache.maven.plugins
- maven-gpg-plugin
- 1.5
+ maven-enforcer-plugin
+ 3.6.3
- sign-artifacts
- verify
+ enforce-toolchain
- sign
+ enforce
-
-
-
- --pinentry-mode
- loopback
-
-
-
-
+
+
+
+ [11,12)
+ Build with JDK 11. The plugin ships for a Java 11 runtime.
+
+
+ [3.6.3,)
+ Maven 3.6.3 or newer is required for maven.compiler.release.
+
+
+
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.7
- true
-
- ossrh
- https://s01.oss.sonatype.org/
- true
-
-
-
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.2.1
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 3.2.0
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.5
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.7
+
+
+
+
+
+
+
+ release
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+ --pinentry-mode
+ loopback
+
+
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ true
+
+ ossrh
+ https://s01.oss.sonatype.org/
+ true
+
+
+
+
+
+
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
index 9ef4c8da..8cf6c3d0 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
@@ -9,6 +9,7 @@
import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
import org.micromanager.lightsheetmanager.gui.components.SettingsListener;
import org.micromanager.lightsheetmanager.gui.data.Icons;
+import org.micromanager.lightsheetmanager.gui.utils.DialogUtils;
import org.micromanager.lightsheetmanager.LightSheetManager;
import org.micromanager.lightsheetmanager.gui.tabs.acquisition.AdvancedTimingPanel;
import org.micromanager.lightsheetmanager.gui.tabs.acquisition.CameraPanel;
@@ -232,7 +233,15 @@ private void createEventHandlers() {
if (btnRunAcquisition_.isSelected()) {
runAcquisition(false);
} else {
- model_.acquisitions().requestStop();
+ // confirm first: one stray click discards a run in progress
+ if (DialogUtils.showYesNoDialog(this, "Stop Acquisition",
+ "Stop the current acquisition?")) {
+ model_.acquisitions().requestStop();
+ } else {
+ // the press already flipped the toggle, so put it back or the button
+ // reads "Start Acquisition" while the run is still going
+ btnRunAcquisition_.setState(true);
+ }
}
});