Fix #include and potentially undefined Capture.options object.

This commit is contained in:
wolfbeast 2018-07-26 21:45:34 +02:00 • committed by Roy Tam
commit 61d4ea0009
2 changed files with 2 additions and 2 deletions

View file

@ -368,7 +368,7 @@ Capture.prototype = {
tel("CAPTURE_QUEUE_TIME_MS", this.startDate - this.creationDate);
// timeout timer
let timeout = typeof(this.options.timeout) == "number" ?
let timeout = this.options && typeof(this.options.timeout) == "number" ?
this.options.timeout :
DEFAULT_CAPTURE_TIMEOUT;
this._timeoutTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);

View file

@ -29,7 +29,7 @@ const MAX_THUMBNAIL_AGE_SECS = 172800; // 2 days == 60*60*24*2 == 172800 secs.
const THUMBNAIL_DIRECTORY = "thumbnails";
// contains base64 version of a placeholder thumbnail
#include "blankthumb.inc"
#include blankthumb.inc
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
Cu.import("resource://gre/modules/PromiseWorker.jsm", this);