Destroy the bridge either way, it will be recreated if needed.

4 files changed, 13 insertions, 21 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index fd4ec4d..2b35be5 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -182,11 +182,9 @@ if ($_POST) {
 
 	if (!$input_errors) {
 
-		if($wancfg['bridge'] <> "" and $_POST['bridge'] == "") {
-			$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
-			if($bridge) {
-				destroy_bridge($bridge);
-			}
+		$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
+		if($bridge) {
+			destroy_bridge($bridge);
 		}
 	
 		unset($wancfg['ipaddr']);
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index 216fd9f..5f6c13d 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -106,13 +106,11 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		
-		if($lancfg['bridge'] <> "" and $_POST['bridge'] == "") {
-			$bridge = discover_bridge($lancfg['if'], $lancfg['bridge']);
-			if($bridge) {
-				destroy_bridge($bridge);
-			}
+		$bridge = discover_bridge($lancfg['if'], $lancfg['bridge']);
+		if($bridge) {
+			destroy_bridge($bridge);
 		}
-		
+
 		$lancfg['bridge'] = $_POST['bridge'];
 		
 		if (($lancfg['ipaddr'] != $_POST['ipaddr']) || ($lancfg['subnet'] != $_POST['subnet'])) {
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index 002e752..93896a6 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -165,11 +165,9 @@ if ($_POST) {
 
 	if (!$input_errors) {
 
-		if($optcfg['bridge'] <> "" and $_POST['bridge'] == "") {
-			$bridge = discover_bridge($optcfg['if'], $optcfg['bridge']);
-			if($bridge) {
-				destroy_bridge($bridge);
-			}
+		$bridge = discover_bridge($optcfg['if'], $optcfg['bridge']);
+		if($bridge) {
+			destroy_bridge($bridge);
 		}
 
 		unset($optcfg['dhcphostname']);
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index fd4ec4d..2b35be5 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -182,11 +182,9 @@ if ($_POST) {
 
 	if (!$input_errors) {
 
-		if($wancfg['bridge'] <> "" and $_POST['bridge'] == "") {
-			$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
-			if($bridge) {
-				destroy_bridge($bridge);
-			}
+		$bridge = discover_bridge($wancfg['if'], $wancfg['bridge']);
+		if($bridge) {
+			destroy_bridge($bridge);
 		}
 	
 		unset($wancfg['ipaddr']);