summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-20 18:53:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-20 18:53:11 (GMT)
commit3eb1054ae6c7e06a382e8d3bac9d55cf4a7c7857 (patch)
treeabce907553a9f38641ca5e2a7b5536648020c051 /generic
parent5a0b86d31c2dbb1480e1692c7be6ac6944e27633 (diff)
parent090dff7eae2a557c2293d61f6a6dd7fce5da00c7 (diff)
downloadtk-3eb1054ae6c7e06a382e8d3bac9d55cf4a7c7857.zip
tk-3eb1054ae6c7e06a382e8d3bac9d55cf4a7c7857.tar.gz
tk-3eb1054ae6c7e06a382e8d3bac9d55cf4a7c7857.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'generic')
-rw-r--r--generic/tkFont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index dde722b..d1ef3cf 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -3933,7 +3933,7 @@ TkFontParseXLFD(
faPtr->size = atof(field[XLFD_PIXEL_SIZE] + 1);
} else if (Tcl_GetInt(NULL, field[XLFD_PIXEL_SIZE],
- &i) != TCL_OK) {
+ &i) == TCL_OK) {
faPtr->size = (double)i;
return TCL_ERROR;
}