From 9a6b2a56712c6262180ed25b28d2f2d1ebc7d9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 27 Feb 2016 10:42:35 +0100 Subject: [PATCH] Fix for nonGUI run --- .../decompiler/flash/gui/ImagePanel.java | 4 ++-- src/com/jpexs/decompiler/flash/gui/View.java | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index 7a2d8b6a8..6f26f68d6 100644 --- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -189,7 +189,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { Graphics2D g2 = null; do { - int valid = renderImage.validate(View.conf); + int valid = renderImage.validate(View.getDefaultConfiguration()); if (valid == VolatileImage.IMAGE_INCOMPATIBLE) { renderImage = View.createRenderImage(getWidth(), getHeight(), Transparency.TRANSLUCENT); @@ -336,7 +336,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { calcRect(); if (renderImage != null) { - if (renderImage.validate(View.conf) != VolatileImage.IMAGE_OK) { + if (renderImage.validate(View.getDefaultConfiguration()) != VolatileImage.IMAGE_OK) { renderImage = View.createRenderImage(getWidth(), getHeight(), Transparency.TRANSLUCENT); render(); } diff --git a/src/com/jpexs/decompiler/flash/gui/View.java b/src/com/jpexs/decompiler/flash/gui/View.java index fdede8454..ca767f956 100644 --- a/src/com/jpexs/decompiler/flash/gui/View.java +++ b/src/com/jpexs/decompiler/flash/gui/View.java @@ -728,8 +728,23 @@ public class View { return table; } - public static GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); - public static GraphicsConfiguration conf = env.getDefaultScreenDevice().getDefaultConfiguration(); + private static GraphicsEnvironment env; + + public static GraphicsEnvironment getEnv() { + if (env == null) { + env = GraphicsEnvironment.getLocalGraphicsEnvironment(); + } + return env; + } + + private static GraphicsConfiguration conf; + + public static GraphicsConfiguration getDefaultConfiguration() { + if (conf == null) { + conf = getEnv().getDefaultScreenDevice().getDefaultConfiguration(); + } + return conf; + } public static BufferedImage toCompatibleImage(BufferedImage image) { if (image.getColorModel().equals(conf.getColorModel())) {