From c903e96d00157b8942fc22dc31ce63093224f5e9 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Mon, 26 Jan 2009 23:10:42 -0600
Subject: [PATCH] Don't lose timeline settings on LASH save event...

---
 Timeline/TLE.fl | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/Timeline/TLE.fl b/Timeline/TLE.fl
index 50d3cee..5c40b38 100644
--- a/Timeline/TLE.fl
+++ b/Timeline/TLE.fl
@@ -67,13 +67,14 @@ decl {extern char project_display_name[256];} {global
 decl {extern char *user_config_dir;} {global
 } 
 
-decl {extern LASH *lash;} {selected global
+decl {extern LASH *lash;} {global
 } 
 
 class TLE {open
 } {
   decl {Fl_Color system_colors[3];} {}
-  Function {save()} {} {
+  Function {save()} {open
+  } {
     code {const char options_filename[] = "options";
 // const char state_filename[] = "state";
 
@@ -106,29 +107,32 @@ if ( r < 0 )
   }
   Function {save_timeline_settings()} {open
   } {
-    code {if ( Project::open() )
-{
-	// save project local options (Timeline menu)
-	((Fl_Menu_Settings*)menubar)->dump( menubar->find_item( "&Project/Se&ttings" ), "options" );
+    code {if ( ! Project::open() )
+	return;
 	
 
-	char path[256];
-	snprintf( path, sizeof( path ), "%s/%s", user_config_dir, ".default_project_settings" );
+// save project local options (Timeline menu)
+((Fl_Menu_Settings*)menubar)->dump( menubar->find_item( "&Project/Se&ttings" ), "options" );} {}
+  }
+  Function {reset_timeline_settings( void )} {open private return_type void
+  } {
+    code {char path[256];
+snprintf( path, sizeof( path ), "%s/%s", user_config_dir, ".default_project_settings" );
 
-	((Fl_Menu_Settings*)menubar)->load( menubar->find_item( "&Project/Se&ttings" ), path );
-}} {}
+((Fl_Menu_Settings*)menubar)->load( menubar->find_item( "&Project/Se&ttings" ), path );} {}
   }
   Function {load_timeline_settings()} {open
   } {
-    code {if ( Project::open() )
-{
-	((Fl_Menu_Settings*)menubar)->load( menubar->find_item( "&Project/Se&ttings" ), "options" );
-}
+    code {reset_timeline_settings();
 
 
+if ( Project::open() )
+	((Fl_Menu_Settings*)menubar)->load( menubar->find_item( "&Project/Se&ttings" ), "options" );
+
 update_menu();
 
-project_name->redraw();} {}
+project_name->redraw();} {selected
+    }
   }
   Function {run()} {} {
     code {update_menu();
@@ -670,7 +674,7 @@ ab.run();}
           class Fl_Blinker
         }
         Fl_Box stats_box {
-          label {<stats>} selected
+          label {<stats>}
           xywh {810 1 215 21} labelsize 13 labelcolor 53 align 88
         }
       }