diff --git a/ChangeLog b/ChangeLog
index 842145947..613f070d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20 Riccardo Mottola <rmottola@users.sf.net>
+
+	* Source/NSWindow: do not process GSAppKitWindowLeave events for
+	closed windows
+
+	* Source/NSImage.m: _useFromFile: make extension checking case
 2010-01-19 13:49-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSMenu.m: Allow menus attached to popups to come up
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 153743aaf..5c8892298 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -3953,6 +3953,10 @@ resetCursorRectsForView(NSView *theView)
               break;
 
             case GSAppKitWindowLeave:
+	      /* we ignore this event for a window that is already closed */
+	      if (_f.has_closed == YES); 
+	        break;
+
               /*
                * We need to go through all of the views, and if there
                * is any with a tracking rectangle then we need to