From d1ee4c65651506562d773611ff0145ea1edd79eb Mon Sep 17 00:00:00 2001
From: cris <cris@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 7 Aug 1998 09:33:39 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            : corretto ordine distruzione oggetti nella
 destroy()

git-svn-id: svn://10.65.10.50/trunk@6911 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 at/at0300.cpp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/at/at0300.cpp b/at/at0300.cpp
index 43a02c0ee..9a8ad4abe 100755
--- a/at/at0300.cpp
+++ b/at/at0300.cpp
@@ -104,15 +104,15 @@ bool TGiornalieroC::create()
 
 bool TGiornalieroC::destroy()	
 {
+	delete _asoggetti;
+	delete _sidoneita;
+	delete _scontrolli;
+	delete _sdonazioni;
+	delete _idoneita;
+	delete _contsan;
+	delete _donaz;	
 	delete _rel;
 	delete _msk;
-	delete _donaz;
-	delete _contsan;
-	delete _idoneita;
-	delete _sdonazioni;
-	delete _scontrolli;
-	delete _sidoneita;
-	delete _asoggetti;
 	return TApplication::destroy();
 }
 
@@ -345,6 +345,7 @@ bool TGiornalieroC::soggetti_notify(TSheet_field& s, int r, KEY k)
 				app()._modified = TRUE;
 			const long codsog = row.get_long(0);
 			if (codsog != 0)
+			{
 				for (int i=s.items()-1; i>=0; i--)
 				{
 					if (i != r)
@@ -354,6 +355,17 @@ bool TGiornalieroC::soggetti_notify(TSheet_field& s, int r, KEY k)
 							return s.sheet_mask().field(F_S_CODICE).error_box("Soggetto gia' inserito");
 					}					
 				}				
+  			TLocalisamfile contsan(LF_CONTSAN);
+  			contsan.setkey(2);
+	 			contsan.zero();         
+  			TDate datacon = row.get(5);
+  			if (!datacon.ok())
+  				datacon = s.mask().get_date(F_DATACON);
+ 				contsan.put(CON_DATACON,datacon);
+				contsan.put(CON_CODICE,codsog);
+				if (contsan.read() == NOERR)
+					return s.sheet_mask().field(F_S_CODICE).error_box("Il soggetto ha gia' un controllo in data %s", datacon.string());
+			}				
 			else
 			{
 				const char* cognome = row.get(1);