Misc small fixes for AutoXHR

plugins/auto_xhr.js

@@ -175,6 +175,7 @@ MutationHandler.prototype.sendEvent = function(i) {
 
 	this.watch--;
 
+	this.clearTimeout();
 	ev.resource.resources = ev.resources;
 
 	BOOMR.responseEnd(ev.resource);
@@ -195,7 +196,7 @@ MutationHandler.prototype.setTimeout = function(timeout, index) {
 MutationHandler.prototype.timedout = function(index) {
 	this.clearTimeout();
 
-	if(this.pending_events[index].type === "xhr") {
+	if(this.pending_events[index] && this.pending_events[index].type === "xhr") {
 		this.sendEvent(index);
 	}
 	else {
@@ -251,6 +252,13 @@ MutationHandler.prototype.wait_for_node = function(node, index) {
 
 		url=node.src || node.href;
 
+		if(node.nodeName === "IMG") {
+			if(node.naturalWidth) {
+				// img already loaded
+				return false;
+			}
+		}
+
 		// no URL or javascript: or about: URL, so no network activity
 		if(!url || url.match(/^(about:|javascript:)/i)) {
 			return false;