Merge branch 'master' of https://github.com/nikiroo/nikiroo-utils

diff --git a/changelog.md b/changelog.md
index c6314649bf47796430f277b3a80822fb3b186635..123603985c0f96b8964de43c6c02aba2fa9407be 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,6 @@
 # nikiroo-utils
 
-## Version WIP
+## Version 4.5.2
 
 - Serial: fix b64/not b64 error
 - Serial: perf improvement

diff --git a/src/be/nikiroo/utils/ui/ConfigItem.java b/src/be/nikiroo/utils/ui/ConfigItem.java
index 8545485d0dc2a98196796bb2ec305c502acb2755..691c6198319b24d71ea2710e6f96f7aa348a3c49 100644 (file)
--- a/src/be/nikiroo/utils/ui/ConfigItem.java
+++ b/src/be/nikiroo/utils/ui/ConfigItem.java
@@ -51,7 +51,7 @@ public class ConfigItem<E extends Enum<E>> extends JPanel {
                String tooltip = null;
                if (bundle.getDescriptionBundle() != null) {
                        tooltip = bundle.getDescriptionBundle().getString(id);
-                       if (tooltip.trim().isEmpty()) {
+                       if (tooltip != null && tooltip.trim().isEmpty()) {
                                tooltip = null;
                        }
                }