--- ray/src/util/trad.wsh	1994/10/31 11:35:28	2.5
+++ ray/src/util/trad.wsh	1994/11/28 12:15:18	2.8
@@ -46,13 +46,13 @@ Do you wish to save it now?"
 			2 { return 0 }
 		}
 		if $readonly {
-			.file invoke
 			set curmess {Rename file or uncheck read-only to save.}
+			.file invoke
 			return 0
-		} else {
-			catch {unset oldradvar}
-			save_vars $rifname
-		}
+		} elseif {[save_vars $rifname]} {
+			gotfile 1
+			return 1
+		} else { return 0 }
 	} else { return 1 }
 }
 
@@ -159,6 +159,7 @@ proc gotfile {{o 1}} {		# set file possession state
 		}
 	} else {
 		set mode disabled
+		.file invoke
 	}
 	foreach b {scene zone views options action results} {
 		.$b configure -state $mode
@@ -168,14 +169,13 @@ proc gotfile {{o 1}} {		# set file possession state
 # Decide where to go and start
 
 if {[llength $argv] == 0} {
-	gotfile 0
 	set curmess "Choose a Radiance project file."
-	.file invoke
+	gotfile 0
 } elseif {[llength $argv] == 1} {
 	cd [file dirname $argv]
 	set curfile [file tail $argv]
 	if {! [file exists $curfile]} {
-		newnew $argv
+		newnew $curfile
 		.scene invoke
 	} elseif {[newload $curfile]} {
 		if $alldone {