Merge branch 'main' of https://github.com/micro-manager/pycro-manager

henrypinkard · Sep 21, 2023 · 363b748 · 363b748
2 parents f794559 + bab3053
commit 363b748
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.pycro-manager</groupId>
     <artifactId>PycroManagerJava</artifactId>
-     <version>0.44.1</version>
+     <version>0.44.2</version>
     <packaging>jar</packaging>
     <name>Pycro-Manager Java</name>
     <description>The Java components of Pycro-Manager</description>
@@ -144,4 +144,4 @@
       </repository>
    </distributionManagement>
 
-</project>
+</project>
diff --git a/java/src/main/java/org/micromanager/remote/HeadlessLauncher.java b/java/src/main/java/org/micromanager/remote/HeadlessLauncher.java
@@ -30,7 +30,9 @@ public static void main(String[] args) throws Exception {
       int bufferSizeMB = Integer.parseInt(args[2]);
       String coreLogPath = args[3];
 
-      core.loadSystemConfiguration(configFilePath);
+      if (configFilePath != null && configFilePath.length() != 0) {
+         core.loadSystemConfiguration(configFilePath);
+      }
       core.setCircularBufferMemoryFootprint(bufferSizeMB);
       core.enableStderrLog(true);
       core.enableDebugLog(true);

diff --git a/pycromanager/test/test_startup.py b/pycromanager/test/test_startup.py
@@ -1,7 +1,6 @@
 import os
 from pycromanager import Core
 
-
 def test_connect_to_core(launch_mm_headless):
     mmc = Core()