Apply #601 fix to firewall_nat.php

1 files changed, 4 insertions, 2 deletions

diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php
index 71cd143..0a6dfcb 100644
--- a/src/usr/local/www/firewall_nat.php
+++ b/src/usr/local/www/firewall_nat.php
@@ -129,6 +129,7 @@ if (isset($_POST['del_x'])) {
 	/* delete selected rules */
 	if (is_array($_POST['rule']) && count($_POST['rule'])) {
 		$a_separators = &$config['nat']['separator'];
+		$num_deleted = 0;
 
 		foreach ($_POST['rule'] as $rulei) {
 			$target = $rule['target'];
@@ -136,16 +137,17 @@ if (isset($_POST['del_x'])) {
 			// Check for filter rule associations
 			if (isset($a_nat[$rulei]['associated-rule-id'])) {
 				delete_id($a_nat[$rulei]['associated-rule-id'], $config['filter']['rule']);
-
 				mark_subsystem_dirty('filter');
 			}
 
 			unset($a_nat[$rulei]);
 
 			// Update the separators
-			$ridx = $rulei;
+			// As rules are deleted, $ridx has to be decremented or separator position will break
+			$ridx = $rulei - $num_deleted;
 			$mvnrows = -1;
 			move_separators($a_separators, $ridx, $mvnrows);
+			$num_deleted++;
 		}
 
 		if (write_config()) {