diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkWindow.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2005-01-07 Donal K. Fellows <donal.k.fellows@man.ac.uk> + + * generic/tkWindow.c (GetScreen): Make sure the result is reset on + all error paths to stop strange errors. [Bug 697915] + 2005-01-05 Donal K. Fellows <donal.k.fellows@man.ac.uk> * doc/loadTk.n, doc/toplevel.n: Convert to other form of emacs diff --git a/generic/tkWindow.c b/generic/tkWindow.c index c71f8a0..d392241 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.65 2004/12/17 14:27:18 chengyemao Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.66 2005/01/07 11:14:39 dkf Exp $ */ #include "tkPort.h" @@ -479,6 +479,7 @@ GetScreen(interp, screenName, screenPtr) */ dispPtr = TkpOpenDisplay(screenName); if (dispPtr == NULL) { + Tcl_ResetResult(interp); Tcl_AppendResult(interp, "couldn't connect to display \"", screenName, "\"", (char *) NULL); return (TkDisplay *) NULL; |