X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.cpp;h=c4b2edbbe6bacc4a4dd78084d28507144936b83e;hb=0bb3819d65bd7e73d008e227a2c23a49c015ad2f;hp=5e706e78976149f4574def0c1ceb9469d0950b8a;hpb=c06a8c65db80b644ab7a31a492a8060b9a95eb8b;p=creaImageIO.git

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