From 0bb3819d65bd7e73d008e227a2c23a49c015ad2f Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Date: Thu, 23 Aug 2018 11:27:44 +0200
Subject: [PATCH] #3218 creaImageIO Feature New Normal  -  vtk8itk4wx3-mingw64

---
 src/creaImageIOWxGimmickView.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 5e706e7..c4b2edb 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -138,7 +138,7 @@ namespace creaImageIO
       mProgressDialog(NULL),
       mConstructed(false)
   {
-	mViewer=NULL;
+	mViewer = NULL;
     GimmickDebugMessage(1,"WxGimmickView::WxGimmickView" <<std::endl);
     // Sets the current directory to the home dir
     mCurrentDirectory =  std2wx(gimmick->GetHomeDirectory());
@@ -230,6 +230,8 @@ namespace creaImageIO
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <<std::endl);
 	delete mIcon;
 	delete mViewer;
+	mIcon	= NULL;
+	mViewer	= NULL;
     //if(mListener->IsAlive())   {        mListener->Delete();    }
   }
   //======================================================================
@@ -802,9 +804,11 @@ namespace creaImageIO
 #else
   void WxGimmickView::UpdateWindowUI(long flags)
   {
-	  if(mViewer)
+	  if(mViewer!=NULL)
      {
-        mViewer->RefreshIfNecessary();
+// EED 2018-08-23
+// GL Conflict because window is not showing the fist time
+//EED        mViewer->RefreshIfNecessary();
      }
   }
 #endif
-- 
2.47.1