diff --git a/ChangeLog b/ChangeLog index f75526c84..03d77df27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-28 12:04 Gregory John Casamento + + * Source/NSWindow.m: Correction for bug#11409. + 2004-12-23 05:38 Gregory John Casamento * Images/MagnifyGlass.tiff: Added. The NSColorPanel class uses diff --git a/Source/NSWindow.m b/Source/NSWindow.m index 26ba6ed2f..9a0a615e0 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -4110,10 +4110,13 @@ resetCursorRectsForView(NSView *theView) [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &flag]; [self setAcceptsMouseMovedEvents: flag]; - /* _miniaturizedImage has already been set by -_initDefaults. */ - DESTROY(_miniaturizedImage); - [aDecoder decodeValueOfObjCType: @encode(id) - at: &_miniaturizedImage]; + /* If the image has been specified, use it, if not use the default. */ + obj = [aDecoder decodeObject]; + if(obj != nil) + { + ASSIGN(_miniaturizedImage, obj); + } + [aDecoder decodeValueOfObjCType: @encode(id) at: &_initialFirstResponder];