From 70a45347edcbd1bbbaaf223a90b3d2609a6d32b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sat, 29 Jul 2017 23:12:08 +0200
Subject: [PATCH] fix: correctly end forms

Change-Id: Idc8e498c70cfc040730837242ddaa2384401dc58
---
 src/club/wpia/gigi/output/template/Form.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/club/wpia/gigi/output/template/Form.java b/src/club/wpia/gigi/output/template/Form.java
index ec3909e1..1e941201 100644
--- a/src/club/wpia/gigi/output/template/Form.java
+++ b/src/club/wpia/gigi/output/template/Form.java
@@ -136,17 +136,18 @@ public abstract class Form implements Outputable {
         try {
             SubmissionResult res = submit(req);
             req.setAttribute(SUBMIT_RESULT, res);
-            if (res instanceof RedirectResult) {
-                resp.sendRedirect(((RedirectResult) res).target);
-                return true;
-            }
             if (res.endsForm()) {
                 HttpSession hs = req.getSession();
                 hs.removeAttribute("form/" + getClass().getName() + "/" + csrf);
             }
+            if (res instanceof RedirectResult) {
+                resp.sendRedirect(((RedirectResult) res).target);
+                return true;
+            }
             return false;
         } catch (PermamentFormException e) {
             req.setAttribute(SUBMIT_RESULT, e);
+            req.getSession().removeAttribute("form/" + getClass().getName() + "/" + csrf);
             return false;
         } catch (GigiApiException e) {
             req.setAttribute(SUBMIT_RESULT, e);
-- 
2.39.2