Skip to content

Commit 57173f1

Browse files
fix: correct openrocket_runtime init signature for newer orhelper versions
1 parent 3f2dd64 commit 57173f1

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

rocketserializer/openrocket_runtime.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ def __init__(self, jar_path, log_level="OFF"):
153153
)
154154

155155
# Get the default JVM path early so we can pass it
156-
jvm_path = jpype.getDefaultJVMPath()
157156
# Initialize the base class with kwargs to bypass auto-discovery
158-
super().__init__(jar=str(self.jar_path), jvm=str(jvm_path), loglevel=log_level)
157+
super().__init__(jar_path=str(self.jar_path), log_level=log_level)
158+
self.jar_path = Path(self.jar_path) # orhelper may overwrite it as str
159159
self.openrocket = None
160160
# for newest orhelper support
161161
self.openrocket_core = None
@@ -182,7 +182,9 @@ def _block_loader(gui_module, field_name):
182182
pass
183183

184184
def __enter__(self):
185-
ensure_java_compatibility(self.jar_path)
185+
# We need to guarantee that the right Java is used for the jar
186+
# before starting JVM
187+
ensure_java_compatibility(Path(self.jar_path))
186188

187189
jvm_path = jpype.getDefaultJVMPath()
188190
logger.info(

0 commit comments

Comments
 (0)