From 7518aa645baf8cd6dde740f0f3852bfc49af52cf Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Thu, 14 Jun 2007 23:09:01 +0000
Subject: [PATCH] - dialog-close for the original (non-cloned) dialog instance
 - simplify close() function for cloned instances (ignore errors via call())

---
 gui/dialogs/file-select.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gui/dialogs/file-select.xml b/gui/dialogs/file-select.xml
index dff1efe08..d4b26ddf9 100644
--- a/gui/dialogs/file-select.xml
+++ b/gui/dialogs/file-select.xml
@@ -87,6 +87,9 @@
 				<command>nasal</command>
 				<script>ok()</script>
 			</binding>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
 		</button>
 	</group>
 
@@ -194,9 +197,8 @@
 			}
 
 			var close = func {
-				if (contains(globals.gui, "file_selector")
-						and contains(gui.file_selector.instance, dlgname))
-					gui.file_selector.instance[dlgname].close();
+				var err = [];
+				call(func { gui.FileSelector.instance[dlgname].close() }, nil, err);
 			}
 
 			var ok = func {