From: Niki <david.roulet@uclouvain.be>
Date: Wed, 10 Apr 2019 09:01:40 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/nikiroo/nikiroo-utils
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=94c44e42bf9d13fb372733318d9667c35af266be;hp=8c24251662730af2083c89999c2d9b8499c4df4a;p=fanfix.git

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

diff --git a/changelog.md b/changelog.md
index c631464..1236039 100644
--- 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 8545485..691c619 100644
--- 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;
 			}
 		}