From 9747e1f328f6d44763db0ea918a3c3e08158b99c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 16 Jul 2018 20:55:33 +0200
Subject: [PATCH] firewall: like this better

---
 src/etc/inc/filter.inc | 4 +++-
 src/etc/inc/gwlb.inc   | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index 5a19dff74..35da8d3d4 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -315,7 +315,9 @@ function filter_configure_sync($verbose = false, $flush_states = false)
         flush();
     }
 
-    fixup_default_gateway();
+    if (isset($config['system']['gw_switch_default'])) {
+        fixup_default_gateway();
+    }
 
     $aliases = filter_generate_aliases();
     $aliases .= "\n# Plugins tables\n";
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc
index 3239927f1..776c7d77f 100644
--- a/src/etc/inc/gwlb.inc
+++ b/src/etc/inc/gwlb.inc
@@ -866,12 +866,6 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive
 
 function fixup_default_gateway()
 {
-    global $config;
-
-    if (!isset($config['system']['gw_switch_default'])) {
-        return;
-    }
-
     $gateways_status = return_gateways_status(true);
     $gateways_arr = return_gateways_array();