summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-11-12 01:19:27 (GMT)
committernijtmans <nijtmans>2008-11-12 01:19:27 (GMT)
commit2e224288a7fd102a069cdbb2f85bc71a7f9a60ef (patch)
treeac2eb97641642127a10991ca2c3a1321840ea76d /generic
parent8f0e26afae621cfcfc105b9c3535379e29ec82c4 (diff)
downloadtk-2e224288a7fd102a069cdbb2f85bc71a7f9a60ef.zip
tk-2e224288a7fd102a069cdbb2f85bc71a7f9a60ef.tar.gz
tk-2e224288a7fd102a069cdbb2f85bc71a7f9a60ef.tar.bz2
fix [Bug 2265860] new test failures
Diffstat (limited to 'generic')
-rw-r--r--generic/tkImgPhoto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 6213472..44a63fe 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
* Department of Computer Science,
* Australian National University.
*
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.86 2008/11/12 00:15:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.87 2008/11/12 01:19:27 nijtmans Exp $
*/
#include "tkImgPhoto.h"
@@ -2522,7 +2522,7 @@ Tk_FindPhoto(
ClientData clientData =
Tk_GetImageMasterData(interp, imageName, &typePtr);
- if (typePtr != &tkPhotoImageType) {
+ if ((typePtr == NULL) || (typePtr->name != tkPhotoImageType.name)) {
return NULL;
}
return clientData;