From 8e80d8d755f70628784ff98cb071259b3727d344 Mon Sep 17 00:00:00 2001
From: Alex Wykoff <alex@alexwykoff.com>
Date: Wed, 1 Mar 2017 17:59:57 -0600
Subject: [PATCH] Fixes #7436

shifted a smidge of logic lower per suggestion by jonathansampson

Auditors: @bsclifton @jonathansampson
---
 app/common/state/extensionState.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/common/state/extensionState.js b/app/common/state/extensionState.js
index 223cc542c54..9da856c1968 100644
--- a/app/common/state/extensionState.js
+++ b/app/common/state/extensionState.js
@@ -91,13 +91,6 @@ const extensionState = {
     tabId = tabId ? tabId.toString() : '-1'
     let basePath = browserAction.get('base_path')
     if (basePath) {
-      let baseIcons16 = browserAction.getIn(['icons', '16'])
-      let baseIcons48 = browserAction.getIn(['icons', '48'])
-      if (baseIcons16 && baseIcons48) {
-        return `-webkit-image-set(
-                  url(${basePath}/${baseIcons16}) 1x,
-                  url(${basePath}/${baseIcons48}) 2x`
-      }
       let baseIcons19 = browserAction.getIn(['icons', '19'])
       let baseIcons38 = browserAction.getIn(['icons', '38'])
       if (baseIcons19 && baseIcons38) {
@@ -119,6 +112,13 @@ const extensionState = {
                   url(${basePath}/${basePath19}) 1x,
                   url(${basePath}/${basePath38}) 2x`
       }
+      let baseIcons16 = browserAction.getIn(['icons', '16'])
+      let baseIcons48 = browserAction.getIn(['icons', '48'])
+      if (baseIcons16 && baseIcons48) {
+        return `-webkit-image-set(
+                  url(${basePath}/${baseIcons16}) 1x,
+                  url(${basePath}/${baseIcons48}) 2x`
+      }
     }
     return ''
   },