Skip to content

Commit d7c74d6

Browse files
committed
Properly load bootstrap when first built.
1 parent 7da3c14 commit d7c74d6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/gd_kotlin.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ bool GDKotlin::load_dynamic_lib() {
7878

7979
if (OS::get_singleton()->open_dynamic_library(path_to_jvm_lib, jvm_dynamic_library_handle) != OK) {
8080
DISPLAY_ERROR(
81-
"Failed to load the jvm dynamic library from path " + path_to_jvm_lib,
82-
"Make sure you have built your JVM project with Graal native image enabled in your gradle build."
81+
"Failed to load the jvm dynamic library from path: " + path_to_jvm_lib,
82+
"Make sure you use a valid JVM 11+ with proper read access."
8383
);
8484
}
8585
return true;
@@ -426,8 +426,8 @@ void GDKotlin::display_initialization_error_hint(String cause, String hint) {
426426

427427
void GDKotlin::validate_state() {
428428
// Don't invalidate the state because everything is either loaded or the Kotlin project has simply not be built.
429-
if (state == State::CORE_LIBRARY_INITIALIZED || state == State::JVM_SCRIPTS_INITIALIZED) { return; }
429+
if (state >= State::JVM_STARTED) { return; }
430430

431431
finalize_down_to(NOT_STARTED);
432-
JVM_LOG_WARNING("JVM Module not properly started, you won't be able to use Java or Kotlin scripts.");
432+
JVM_LOG_WARNING("JVM not properly started, you won't be able to use Java or Kotlin scripts.");
433433
}

0 commit comments

Comments
 (0)