From 493c91e50227f7455d2a09a0029084e0faa38e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 6 Mar 2021 11:12:07 +0100 Subject: [PATCH] Fixed: Exception when switching from nonribbon interface to ribbob --- CHANGELOG.md | 3 +++ src/com/jpexs/decompiler/flash/gui/View.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73b9430d2..b6c49376c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ All notable changes to this project will be documented in this file. ### Changed - [#1471] Import script menuitem renamed to Import scripts. +### Fixed +- Exception when switching from nonribbon interface to ribbob + ## [14.1.0] - 2021-03-05 ### Added - [#1561] Font editing - import ascent, descent, leading, kerning diff --git a/src/com/jpexs/decompiler/flash/gui/View.java b/src/com/jpexs/decompiler/flash/gui/View.java index 6cc8a1a5c..dcb8eb61f 100644 --- a/src/com/jpexs/decompiler/flash/gui/View.java +++ b/src/com/jpexs/decompiler/flash/gui/View.java @@ -110,7 +110,7 @@ import org.pushingpixels.substance.internal.utils.SubstanceColorSchemeUtilities; public class View { public static Color getDefaultBackgroundColor() { - if (Configuration.useRibbonInterface.get()) { + if (Configuration.useRibbonInterface.get() && SubstanceLookAndFeel.getCurrentSkin() != null) { return SubstanceLookAndFeel.getCurrentSkin().getColorScheme(DecorationAreaType.GENERAL, ColorSchemeAssociationKind.FILL, ComponentState.ENABLED).getBackgroundFillColor(); } else { return SystemColor.control;