From 576ad2b67bced04bde83de91f5e647af868c5fd4 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Fri, 12 Mar 2010 16:41:08 +0000
Subject: mise en conformité des messages ping /pong Correction pb a la
 fermeture d'ivy

---
 Ivy/Ivy.cxx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Ivy/Ivy.cxx')

diff --git a/Ivy/Ivy.cxx b/Ivy/Ivy.cxx
index 95035d1..1640b45 100644
--- a/Ivy/Ivy.cxx
+++ b/Ivy/Ivy.cxx
@@ -48,7 +48,7 @@ Ivy::~Ivy()
 	delete server;
 	if ( synchronous )
 		{
-		delete IvySynchronousCallback::m_synchro;
+		IvySynchroWnd::Finish();
 		delete application_callback;
 		}
 }
@@ -59,8 +59,8 @@ Ivy::Ivy(const char* name, const char * ready, IvyApplicationCallback *callback,
 	InitializeCriticalSection( &m_application_cs );
 	regexp_id = 0;
 	synchronous = Synchronous;
-	if ( synchronous )
-		IvySynchronousCallback::m_synchro = new IvySynchroWnd();
+	IvySynchroWnd::Init(synchronous);
+	
 	ready_message = ready;
 	ApplicationName = name;
 	
@@ -413,6 +413,10 @@ void Ivy::SetBindCallback( IvyBindingCallback* bind_callback )
 {
 	binding_callback = synchronous ? new IvySynchronousBindingCallback(bind_callback) : bind_callback;
 }
+void Ivy::SetDieCallback( IvyDieCallback* die_cb )
+{
+	die_callback = synchronous ? new IvySynchronousDieCallback(die_cb) : die_cb;
+}
 	
 void Ivy::SetFilter(int argc, const char **argv )
 {
-- 
cgit v1.1