summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-26 21:45:34 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-26 21:45:34 +0200
commit9fc1381e11a0a6adcd3be93b1d0524fd5336282b (patch)
treeeea166c25d29bc8fce100435982051b4b8d6b960
parent1de0d64e0f08d3cc3d3970666126aff33eb06115 (diff)
downloadUXP-9fc1381e11a0a6adcd3be93b1d0524fd5336282b.tar
UXP-9fc1381e11a0a6adcd3be93b1d0524fd5336282b.tar.gz
UXP-9fc1381e11a0a6adcd3be93b1d0524fd5336282b.tar.lz
UXP-9fc1381e11a0a6adcd3be93b1d0524fd5336282b.tar.xz
UXP-9fc1381e11a0a6adcd3be93b1d0524fd5336282b.zip
Fix #include and potentially undefined Capture.options object.
-rw-r--r--toolkit/components/thumbnails/BackgroundPageThumbs.jsm2
-rw-r--r--toolkit/components/thumbnails/PageThumbs.jsm2
2 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
index b2aa646f7..e743c4dd9 100644
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -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);
diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/toolkit/components/thumbnails/PageThumbs.jsm
index 4b343c605..5c7754b31 100644
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/toolkit/components/thumbnails/PageThumbs.jsm
@@ -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);