[CVS] avview avview.scp,1.125,1.126

[<gat...@li...>]

Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv11171

Modified Files:
	avview.scp 
Log Message:
Prevent AVview from saving settings on exit before initialization is complete.


Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- avview.scp	2 Mar 2003 17:24:25 -0000	1.125
+++ avview.scp	5 Mar 2003 17:05:27 -0000	1.126
@@ -47,6 +47,7 @@
 	dpms_off_on_fullscreen_power_off "false"
 	disable_fullscreen_switching "false"
 	message_visible_secs	14
+	save_settings_on_exit	"unset"
 	} {
 	global $variable
 	set $variable $value
@@ -419,7 +420,7 @@
 	 show_control_window always_start_fullscreen remember_fullscreen_state
 	display_setup_window_on_startup file_save_path dpms_off_on_fullscreen_power_off
 	disable_fullscreen_switching use_physical_screen_size message_visible_secs
-	on_screen_cc_page } {
+	on_screen_cc_page save_settings_on_exit } {
 	global $variable
 	puts $fileid "\nglobal $variable"
 	puts $fileid "set $variable \"[set $variable]\""
@@ -490,6 +491,17 @@
 		after idle {switch_to_pane "/Video device parameters"}
 		}
 	}
+global save_settings_on_exit
+if { $save_settings_on_exit == "unset" } { set save_settings_on_exit "true" }
+}
+
+proc exit_avview {} {
+global save_settings_on_exit
+if { [ffmpeg_present] == "yes" } {
+	ffmpeg_stop_encoding
+        }
+if { $save_settings_on_exit == "true" } { save_settings }
+exit
 }
 
 proc check_mapped_state {} {
@@ -722,7 +734,7 @@
 .video_menu add separator
 .video_menu add cascade -menu .video_menu.interface_menu -label "User interface"
 .video_menu add separator
-.video_menu add command -label "Exit AVview" -command { save_settings; exit }
+.video_menu add command -label "Exit AVview" -command exit_avview
 .video_menu add separator
 .video_menu add command -label "Dismiss this menu"
 
@@ -816,13 +828,8 @@
 
 
 
-wm protocol . WM_DELETE_WINDOW { 
-        if { [ffmpeg_present] == "yes" } {
-                ffmpeg_stop_encoding
-                }
-	save_settings  
-	exit 
-	}
+wm protocol . WM_DELETE_WINDOW exit_avview
+
 #wm protocol .controlwin WM_DELETE_WINDOW {
 #        if { [ffmpeg_present] == "yes" } {
 #                ffmpeg_stop_encoding