From c985683ee3b0225a4fc5c781e252120315abf7a7 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Wed, 26 Aug 2020 19:41:50 +0200
Subject: [PATCH] Fixed #3737

---
 app/Http/Controllers/Rule/CreateController.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index e7a50340fd..65926fd693 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -143,6 +143,12 @@ class CreateController extends Controller
         $oldTriggers = $this->getTriggersForBill($bill);
         $oldActions  = $this->getActionsForBill($bill);
 
+        // restore actions and triggers from old input:
+        if ($request->old()) {
+            $oldTriggers = $this->getPreviousTriggers($request);
+            $oldActions  = $this->getPreviousActions($request);
+        }
+
         $triggerCount = count($oldTriggers);
         $actionCount  = count($oldActions);
         $subTitleIcon = 'fa-clone';
@@ -179,8 +185,6 @@ class CreateController extends Controller
         // get triggers and actions for journal.
         $oldTriggers  = $this->getTriggersForJournal($journal);
         $oldActions   = [];
-        $triggerCount = count($oldTriggers);
-        $actionCount  = count($oldActions);
 
         $this->createDefaultRuleGroup();
         $this->createDefaultRule();
@@ -192,6 +196,15 @@ class CreateController extends Controller
             'description' => (string) trans('firefly.new_rule_for_journal_description', ['description' => $journal->description]),
         ];
 
+        // restore actions and triggers from old input:
+        if ($request->old()) {
+            $oldTriggers = $this->getPreviousTriggers($request);
+            $oldActions  = $this->getPreviousActions($request);
+        }
+
+        $triggerCount = count($oldTriggers);
+        $actionCount  = count($oldActions);
+
         // flash old data
         $request->session()->flash('preFilled', $preFilled);