summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2015-05-26 12:35:23 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2015-05-26 12:35:23 (GMT)
commite8256daf20f6eb574e05520f28483be901e5bc35 (patch)
tree05c003eefe05805fe71882ccb84470e6f4738800 /library
parentfc2586d0f5c1507a804f39764200216cc6ac4875 (diff)
downloadtk-e8256daf20f6eb574e05520f28483be901e5bc35.zip
tk-e8256daf20f6eb574e05520f28483be901e5bc35.tar.gz
tk-e8256daf20f6eb574e05520f28483be901e5bc35.tar.bz2
Fix [1641721]: tk_getOpenFile shows symlinks to directories twice.
Diffstat (limited to 'library')
-rw-r--r--library/tkfbox.tcl4
1 files changed, 4 insertions, 0 deletions
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index e145805..fd0f6d7 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -1896,6 +1896,10 @@ proc ::tk::dialog::file::GlobFiltered {dir type {overrideFilter 0}} {
if {$f eq "." || $f eq ".."} {
continue
}
+ # See ticket [1641721], $f might be a link pointing to a dir
+ if {$type != "d" && [file isdir [file join $dir $f]]} {
+ continue
+ }
lappend result $f
}
}