From 154d66ee2ba284c660ae8f0430757d18d0c77a02 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Mon, 17 May 2010 22:16:52 +0000 Subject: Fix [Bug #3002230]: tk_chooseDirectory returns garbage on cancel --- ChangeLog | 5 +++++ win/tkWinDialog.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c101fb3..e72b7b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-17 Jan Nijtmans + + * win/tkWinDialog.c: Fix [Bug #3002230]: tk_chooseDirectory returns + garbage on cancel + 2010-05-17 Joe English * generic/tkBind.c: Revert [Patch #2999920], as it entails an 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. */ -- cgit v0.12