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

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 52fad311dd8266026cb5ebcbf8f07bac73171fb1
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Apr 27 14:33:12 2013 +0300

    correctly handle last_used_version wrt changelog popup

diff --git a/src/expdesign/primaries.cc b/src/expdesign/primaries.cc
index 695a110..dfcafbc 100644
--- a/src/expdesign/primaries.cc
+++ b/src/expdesign/primaries.cc
@@ -115,7 +115,8 @@ CExpDesign (const string& session_dir_,
 	if ( last_used_version != VERSION ) {
 		printf( "Purging old files as we are upgrading from version %s to %s\n", last_used_version.c_str(), VERSION);
 	}
-	last_used_version = VERSION;
+	// last_used_version = VERSION;
+	/// leave it so SExpDesignUI::populate will see it and pop the changelog
 
 	scan_tree( progress_fun);
 }
diff --git a/src/ui/mw/populate.cc b/src/ui/mw/populate.cc
index 60b055b..f156a29 100644
--- a/src/ui/mw/populate.cc
+++ b/src/ui/mw/populate.cc
@@ -71,10 +71,12 @@ populate( bool do_load)
 
 	gtk_window_set_title( wMainWindow,
 			      (string ("Aghermann: ") + agh::str::homedir2tilda( ED->session_dir())).c_str());
+
 	if ( ED->last_used_version != VERSION ) {
 		printf( "Upgrading from version %s, here's ChangeLog for you\n", ED->last_used_version.c_str());
 		show_changelog();
 	}
+	ED->last_used_version = VERSION;
 
 	snprintf_buf( "Smooth: %zu", smooth_profile);
 	gtk_button_set_label( (GtkButton*)eMsmtProfileSmooth, __buf__);

-- 
Sleep experiment manager