Author: fredkiefer
Date: Sun Oct 23 22:36:14 2016
New Revision: 40168
URL: http://svn.gna.org/viewcvs/gnustep?rev=40168&view=rev
Log:
* Source/NSWindow.m (NSMiniWindowView -setImage:): Try to handle
an image value of nil. This is needed for Emacs.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSWindow.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=40168&r1=40167&r2=40168&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Sun Oct 23 22:36:14 2016
@@ -1,3 +1,8 @@
+2016-10-23 Fred Kiefer <[email protected]>
+
+ * Source/NSWindow.m (NSMiniWindowView -setImage:): Try to handle
+ an image value of nil. This is needed for Emacs.
+
2016-10-23 Fred Kiefer <[email protected]>
* Source/GSLayoutManager.m (-advancementForGlyphAtIndex:):
Modified: libs/gui/trunk/Source/NSWindow.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSWindow.m?rev=40168&r1=40167&r2=40168&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSWindow.m (original)
+++ libs/gui/trunk/Source/NSWindow.m Sun Oct 23 22:36:14 2016
@@ -576,8 +576,11 @@
NSImage *imgCopy = [anImage copy];
[imgCopy setScalesWhenResized: YES];
- [imgCopy setSize: scaledIconSizeForSize([imgCopy size])];
-
+ if (imgCopy != nil)
+ {
+ [imgCopy setSize: scaledIconSizeForSize([imgCopy size])];
+ }
+
if (imageCell == nil)
{
imageCell = [[NSCell alloc] initImageCell: imgCopy];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
