From 20fd04cb550dabc4a5618aba37f9881596ade0ec Mon Sep 17 00:00:00 2001
From: das <das>
Date: Wed, 25 Jul 2007 05:24:42 +0000
Subject: 	* macosx/tkMacOSXDialog.c (NavServicesGetFile): reset interp
 result on 	nav dialog cancel. [Bug 1743786]

---
 ChangeLog               | 5 +++++
 macosx/tkMacOSXDialog.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3a1a0e7..bd285f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-25  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/tkMacOSXDialog.c (NavServicesGetFile): reset interp result on
+	nav dialog cancel. [Bug 1743786]
+
 2007-07-09  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* unix/Makefile.in: clarify what the headers installed are, and
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index a99242f..2a6ca3c 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.27 2007/06/29 03:20:01 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.28 2007/07/25 05:24:42 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -944,6 +944,7 @@ NavServicesGetFile(
 	Tcl_SetObjResult(interp, theResult);
 	result = TCL_OK;
     } else if (err == userCanceledErr) {
+	Tcl_ResetResult(interp);
 	result = TCL_OK;
     }
 
-- 
cgit v0.12