From aa3e63b1b43dbeff44bfc75d7a6d6b201e42025b Mon Sep 17 00:00:00 2001
From: Patrick Durand <patrick@plealog.com>
Date: Wed, 15 Feb 2017 14:38:31 +0100
Subject: [PATCH] fix dual call of getApplicationComponent at startup

---
 .../genericapp/ui/starter/EZUIStarterImplem.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/plealog/genericapp/ui/starter/EZUIStarterImplem.java b/src/com/plealog/genericapp/ui/starter/EZUIStarterImplem.java
index d7fae1e..99c60bc 100644
--- a/src/com/plealog/genericapp/ui/starter/EZUIStarterImplem.java
+++ b/src/com/plealog/genericapp/ui/starter/EZUIStarterImplem.java
@@ -14,6 +14,7 @@
  */
 package com.plealog.genericapp.ui.starter;
 
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Rectangle;
@@ -30,6 +31,7 @@
 
 import com.plealog.genericapp.api.EZApplicationBranding;
 import com.plealog.genericapp.api.EZEnvironment;
+import com.plealog.genericapp.api.EZUIStarterListener;
 import com.plealog.genericapp.ui.apple.EZAppleConfigurator;
 import com.plealog.genericapp.ui.menu.EZActionManager;
 import com.plealog.resources.Accessor;
@@ -58,9 +60,12 @@ public EZFrame(){
 			if(menuBar!=null){
 				this.setJMenuBar(menuBar);
 			}
-			if (EZEnvironment.getUIStarterListener()!=null &&
-					EZEnvironment.getUIStarterListener().getApplicationComponent()!=null){
-					this.getContentPane().add(EZEnvironment.getUIStarterListener().getApplicationComponent());
+			EZUIStarterListener listener = EZEnvironment.getUIStarterListener(); 
+			if (listener!=null){
+			  Component cp = listener.getApplicationComponent();
+			  if (cp !=null){
+          this.getContentPane().add(cp);
+			  }
 			}
 			this.addWindowListener(new MainWindowAdapter());
 			this.pack();