executeWithDifferentColor no longer crashes if col==null

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / ColorHelper.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/ColorHelper.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/ColorHelper.java
index 0ec42f5..0b65d2b 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/ColorHelper.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/ColorHelper.java
@@ -23,12 +23,17 @@ public class ColorHelper
 
        private static void executeWithDifferentColor(ColorDefinition col, Supplier<Color> getColor, Consumer<Color> setColor, Runnable exec)
        {
-               ColorManager cm = ColorManager.current();
-               Color oldColor = getColor.get();
-               Color newColor = cm.toColor(col);
-               setColor.accept(newColor);
-               exec.run();
-               setColor.accept(oldColor);
+               if (col == null)
+                       exec.run();
+               else
+               {
+                       ColorManager cm = ColorManager.current();
+                       Color oldColor = getColor.get();
+                       Color newColor = cm.toColor(col);
+                       setColor.accept(newColor);
+                       exec.run();
+                       setColor.accept(oldColor);
+               }
        }
 
        private ColorHelper()