From 48264e1fd7f13e49a5eaebfadaf1179e3705a98b Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 4 Jun 2015 16:50:46 -0400
Subject: [PATCH] code review  for #292

---
 platform/firefox/vapi-background.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index d7c7e9b12..4ceb2c3ca 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -116,20 +116,25 @@ vAPI.browserSettings = {
     },
 
     clear: function(branch, setting) {
-        var value = this.originalValues[branch + '.' + setting];
-        if (
-            value === undefined &&
-            this.originalValues.hasOwnProperty(branch + '.' + setting)
-        ) {
+        var key = branch + '.' + setting;
+        // Value was not overriden -- nothing to restore
+        if ( this.originalValues.hasOwnProperty(key) === false ) {
+            return;
+        }
+        var value = this.originalValues[key];
+        // Original value was a default one
+        if ( value === undefined ) {
             try {
                 Services.prefs.getBranch(branch + '.').clearUserPref(setting);
             } catch (ex) {
             }
             return;
         }
+        // Current value is same as original
         if ( this.getBool(branch, setting) === value ) {
             return;
         }
+        // Reset to original value
         try {
             Services.prefs.getBranch(branch + '.').setBoolPref(setting, value);
         } catch (ex) {