diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 20:58:36 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 20:58:36 +0000 |
| commit | ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14 (patch) | |
| tree | 55a1e7c2bf2007f88cc5518052419bee63126688 /toolkit/components/jsdownloads | |
| parent | 9ffed6e8bfb35c090caf5f8bca7a0f8bd4cbec94 (diff) | |
| parent | 1d7664d3a1db098024c7624650b0d272a26635e0 (diff) | |
| download | UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.gz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.lz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.xz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
# old-configure.in
Diffstat (limited to 'toolkit/components/jsdownloads')
| -rw-r--r-- | toolkit/components/jsdownloads/src/DownloadIntegration.jsm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm index 305284749..a6875ec48 100644 --- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm +++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm @@ -368,11 +368,7 @@ this.DownloadIntegration = { */ getPreferredDownloadsDirectory: Task.async(function* () { let directoryPath = null; - let prefValue = 1; - - try { - prefValue = Services.prefs.getIntPref("browser.download.folderList"); - } catch(e) {} + let prefValue = Services.prefs.getIntPref("browser.download.folderList", 1); switch(prefValue) { case 0: // Desktop |