From 79194bcafc587d28c9406e8afb35c67b94bd1d34 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 27 Jan 2017 20:26:44 -0800
Subject: versioning fixes

---
 ext/bg/js/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index cd415d51..eb49d2ab 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -68,7 +68,7 @@ function optionsSetDefaults(options) {
 
 function optionsVersion(options) {
     const copy = (targetDict, targetKey, sourceDict, sourceKey) => {
-        targetDict[targetKey] = sourceDict[sourceKey] || targetDict[targetKey];
+        targetDict[targetKey] = sourceDict.hasOwnProperty(sourceKey) ? sourceDict[sourceKey] : targetDict[targetKey];
     };
 
     options.version = options.version || 0;
-- 
cgit v1.2.3