Revision: 27795
http://sourceforge.net/p/bibdesk/svn/27795
Author: hofman
Date: 2022-08-12 11:31:08 +0000 (Fri, 12 Aug 2022)
Log Message:
-----------
always note favicon to delegate when resetting favicon, it can become nil
Modified Paths:
--------------
trunk/bibdesk/BDSKWebView.m
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2022-08-11 23:15:26 UTC (rev 27794)
+++ trunk/bibdesk/BDSKWebView.m 2022-08-12 11:31:08 UTC (rev 27795)
@@ -216,15 +216,16 @@
if (icon != favicon) {
[favicon release];
favicon = [icon retain];
- if ([[self frameLoadDelegate]
respondsToSelector:@selector(webView:didReceiveIcon:forFrame:)])
- [[self frameLoadDelegate] webView:self didReceiveIcon:favicon
forFrame:nil];
}
+ if ([[self frameLoadDelegate]
respondsToSelector:@selector(webView:didReceiveIcon:forFrame:)])
+ [[self frameLoadDelegate] webView:self didReceiveIcon:favicon
forFrame:nil];
}
- (void)retrieveFavicon {
NSImage *icon = [[BDSKWebIconDatabase sharedDatabase]
recentIconForURLString:[self mainFrameURL]];
if (icon) {
- [self setFavicon:icon];
+ if (icon != favicon)
+ [self setFavicon:icon];
if (faviconFromOrigin == NO)
return;
}
@@ -291,7 +292,8 @@
icon = faviconFromOrigin ? nil : [[BDSKWebIconDatabase sharedDatabase]
recentIconForURLString:[faviconURL absoluteString]];
if (icon) {
[[BDSKWebIconDatabase sharedDatabase] setIcon:icon withData:nil
fromURLString:[faviconURL absoluteString] forURLString:[self mainFrameURL]];
- [self setFavicon:icon];
+ if (icon != favicon)
+ [self setFavicon:icon];
return;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
