[med-svn] [SCM] aghermann branch, master, updated. f0d4c0fd35bf09e7dff56ddb9a2d798ae916c2ef

Andrei Zavada johnhommer at gmail.com
Sun Feb 3 12:53:11 UTC 2013


The following commit has been merged in the master branch:
commit 323ec20eb06a3525e55bc33f62873e11708ecd78
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Feb 3 12:04:35 2013 +0200

    more natural SF destruct sequence

diff --git a/src/ui/sf/sf.cc b/src/ui/sf/sf.cc
index 7ef7bc9..e062717 100644
--- a/src/ui/sf/sf.cc
+++ b/src/ui/sf/sf.cc
@@ -271,18 +271,6 @@ SScoringFacility (agh::CSubject& J,
 aghui::SScoringFacility::
 ~SScoringFacility ()
 {
-	if ( ica )
-		delete ica;
-
-	if ( _artifacts_d )
-		delete _artifacts_d;
-	if ( _patterns_d )
-		delete _patterns_d;
-	if ( _phasediff_d )
-		delete _phasediff_d;
-	if ( _filters_d )
-		delete _filters_d;
-
 	// put scores
 	put_hypnogram();
 
@@ -301,6 +289,18 @@ aghui::SScoringFacility::
 				enable_expd_destructive_controls);
 	gtk_widget_set_visible( (GtkWidget*)_p.tSettings,
 				enable_expd_destructive_controls);
+
+	if ( ica )
+		delete ica;
+
+	if ( _artifacts_d )
+		delete _artifacts_d;
+	if ( _patterns_d )
+		delete _patterns_d;
+	if ( _phasediff_d )
+		delete _phasediff_d;
+	if ( _filters_d )
+		delete _filters_d;
 }
 
 void

-- 
Sleep experiment manager



More information about the debian-med-commit mailing list