diff --git a/java/pom.xml b/java/pom.xml index c933a249..1ab6792c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.micro-manager.pycro-manager PycroManagerJava - 0.44.1 + 0.44.2 jar Pycro-Manager Java The Java components of Pycro-Manager @@ -144,4 +144,4 @@ - \ No newline at end of file + diff --git a/java/src/main/java/org/micromanager/remote/HeadlessLauncher.java b/java/src/main/java/org/micromanager/remote/HeadlessLauncher.java index e7af5099..46b908bd 100644 --- 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/_version.py b/pycromanager/_version.py index b6675a0a..dae0f87c 100644 --- a/pycromanager/_version.py +++ b/pycromanager/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 29, 1) +version_info = (0, 29, 2) __version__ = ".".join(map(str, version_info)) diff --git a/pycromanager/test/test_startup.py b/pycromanager/test/test_startup.py index 8d05511c..7d4fbbae 100644 --- 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()