diff --git a/code/src/utest/pcgen/gui3/dialog/AboutDialogTest.java b/code/src/utest/pcgen/gui3/dialog/AboutDialogTest.java index 5f981962a5b..0ad6e396274 100644 --- a/code/src/utest/pcgen/gui3/dialog/AboutDialogTest.java +++ b/code/src/utest/pcgen/gui3/dialog/AboutDialogTest.java @@ -22,6 +22,7 @@ import java.net.URL; import java.util.ResourceBundle; +import org.apache.commons.lang3.SystemUtils; import pcgen.system.LanguageBundle; import javafx.fxml.FXMLLoader; @@ -41,6 +42,16 @@ class AboutDialogTest @Start private void Start(Stage stage) throws IOException { + /* + TODO Remove once JavaFx is updated to version 13. + This is a temporary fix for https://github.com/javafxports/openjdk-jfx/issues/66. + https://github.com/PCGen/pcgen/pull/5973 + */ + if (SystemUtils.IS_OS_WINDOWS) + { + System.load("C:\\Windows\\System32\\WindowsCodecs.dll"); + } + FXMLLoader loader = new FXMLLoader(); URL resource = AboutDialogController.class.getResource("AboutDialog.fxml"); assert resource != null; diff --git a/code/src/utest/pcgen/gui3/preloader/PCGenPreloaderTest.java b/code/src/utest/pcgen/gui3/preloader/PCGenPreloaderTest.java index f2e773f82f8..5a188a2ec44 100644 --- a/code/src/utest/pcgen/gui3/preloader/PCGenPreloaderTest.java +++ b/code/src/utest/pcgen/gui3/preloader/PCGenPreloaderTest.java @@ -20,6 +20,7 @@ import java.io.IOException; +import org.apache.commons.lang3.SystemUtils; import pcgen.system.LanguageBundle; import javafx.fxml.FXMLLoader; @@ -39,6 +40,16 @@ class PCGenPreloaderTest @Start private void Start(Stage stage) throws IOException { + /* + TODO Remove once JavaFx is updated to version 13. + This is a temporary fix for https://github.com/javafxports/openjdk-jfx/issues/66. + https://github.com/PCGen/pcgen/pull/5973 + */ + if (SystemUtils.IS_OS_WINDOWS) + { + System.load("C:\\Windows\\System32\\WindowsCodecs.dll"); + } + FXMLLoader loader = new FXMLLoader(); loader.setLocation(PCGenPreloader.class.getResource("PCGenPreloader.fxml")); loader.setResources(LanguageBundle.getBundle());