# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1333088790 0
# Node ID 505e68d8d131844934194383e4344f411147cb3d
# Parent  6a65694bdcc2b530ea9dfa50c1ab5fad3ae91bf6
Take care on nullpointers in the MapToolbar because the info button is not always enabled.

flys-client/trunk@4184 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 6a65694bdcc2 -r 505e68d8d131 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Tue Mar 20 14:53:42 2012 +0000
+++ b/flys-client/ChangeLog	Fri Mar 30 06:26:30 2012 +0000
@@ -1,3 +1,9 @@
+2012-03-30  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java:
+	  Take care on Nullpointers; the info button is not available in the
+	  helper panel.
+
 2012-03-20  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Issue 506.
diff -r 6a65694bdcc2 -r 505e68d8d131 flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Tue Mar 20 14:53:42 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Fri Mar 30 06:26:30 2012 +0000
@@ -204,6 +204,10 @@
 
 
     protected void activateGetFeatureInfo(boolean activate) {
+        if (infoButton == null) {
+            return;
+        }
+
         if (activate) {
             infoButton.select();
         }