diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/startup/nsAppStartup.cpp | 5 | ||||
| -rw-r--r-- | toolkit/components/thumbnails/PageThumbs.jsm | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp index fde00d1db..391389605 100644 --- a/toolkit/components/startup/nsAppStartup.cpp +++ b/toolkit/components/startup/nsAppStartup.cpp @@ -1020,8 +1020,13 @@ nsAppStartup::CreateInstanceWithProfile(nsIToolkitProfile* aProfile) return rv; } +#if defined(XP_WIN) + const char *args[] = { "-no-remote", "-P", profileName.get() }; + rv = process->Run(false, args, 3); +#else const char *args[] = { "-P", profileName.get() }; rv = process->Run(false, args, 2); +#endif if (NS_WARN_IF(NS_FAILED(rv))) { return rv; } diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/toolkit/components/thumbnails/PageThumbs.jsm index 9bd3ae4b3..b0affee92 100644 --- a/toolkit/components/thumbnails/PageThumbs.jsm +++ b/toolkit/components/thumbnails/PageThumbs.jsm @@ -609,7 +609,15 @@ this.PageThumbsStorage = { writeData: function Storage_writeData(aURL, aData, aNoOverwrite) { let path = this.getFilePathForURL(aURL); this.ensurePath(); - aData = new Uint8Array(aData); + + // XXX: We try/catch here since 'null' isn't accepted until we implement + // ES2017's new Uint8Array(); allowance. + try { + aData = new Uint8Array(aData); + } catch(e) { + aData = new Uint8Array(0); + } + let msg = [ path, aData, |