summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-05-17 22:16:52 (GMT)
committernijtmans <nijtmans>2010-05-17 22:16:52 (GMT)
commit154d66ee2ba284c660ae8f0430757d18d0c77a02 (patch)
treed24860813a5c31c175c1eec191e6d6645f1ab4a9 /win
parentf74e5ef77536fc80f0f0a89f6cd676e9bc6c5796 (diff)
downloadtk-154d66ee2ba284c660ae8f0430757d18d0c77a02.zip
tk-154d66ee2ba284c660ae8f0430757d18d0c77a02.tar.gz
tk-154d66ee2ba284c660ae8f0430757d18d0c77a02.tar.bz2
Fix [Bug #3002230]: tk_chooseDirectory returns garbage on cancel
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDialog.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 8ac95bf..592559d 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinDialog.c,v 1.74 2010/05/17 08:44:00 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.75 2010/05/17 22:16:52 nijtmans Exp $
*
*/
@@ -2037,6 +2037,13 @@ Tk_ChooseDirectoryObjCmd(
pidl = SHBrowseForFolder(&bInfo);
/*
+ * This is a fix for Windows 2000, which seems to modify the folder name
+ * buffer even when the dialog is canceled (in this case the buffer
+ * contains garbage). See [Bug #3002230]
+ */
+ path[0] = '\0';
+
+ /*
* Null for cancel button or invalid dir, otherwise valid.
*/