aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2015-08-31 18:43:40 -0400
committergorhill <rhill@raymondhill.net>2015-08-31 18:43:40 -0400
commit05ce6711e8941d00371850274690e11f2e5d3bf5 (patch)
tree3911e5a6e6b7783beba679d2572f1f14e50f9fc3 /src
parent8adf1c46164a2837355a8b0982959fdbbe69ae8b (diff)
downloaduBlock-05ce6711e8941d00371850274690e11f2e5d3bf5.zip
uBlock-05ce6711e8941d00371850274690e11f2e5d3bf5.tar.gz
uBlock-05ce6711e8941d00371850274690e11f2e5d3bf5.tar.bz2
this fixes #668, #669
Diffstat (limited to 'src')
-rw-r--r--src/js/storage.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/js/storage.js b/src/js/storage.js
index c060849..6d2eeda 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -927,7 +927,11 @@
}
}
newListKey = this.oldListToNewListMap[oldListKey];
- if ( newListKey !== '' ) {
+ // https://github.com/gorhill/uBlock/issues/668
+ // https://github.com/gorhill/uBlock/issues/669
+ // Beware: an entry for the new list key may already exists. If it is
+ // the case, leave it as is.
+ if ( newListKey !== '' && filterLists.hasOwnProperty(newListKey) === false ) {
listEntry = filterLists[listKey];
listEntry.homeURL = undefined;
filterLists[newListKey] = listEntry;