From 75a50345ffa9c525b996d052d4b24b668ec20d42 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 12 Sep 2021 19:57:19 +0200
Subject: [PATCH] Allow clearing the faction banner.
 https://bugs.eressea.de/view.php?id=2774

---
 src/kernel/faction.c | 7 ++++++-
 src/laws.c           | 9 ++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index bbcb7896c..20cf7a697 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -538,7 +538,12 @@ const char *faction_getbanner(const faction * f)
 
 void faction_setbanner(faction * f, const char *banner)
 {
-    f->banner_id = dbstring_save(banner);
+    if (banner && banner[0]) {
+        f->banner_id = dbstring_save(banner);
+    }
+    else {
+        f->banner_id = 0;
+    }
 }
 
 const char *faction_getpassword(const faction *f) {
diff --git a/src/laws.c b/src/laws.c
index b5f448d7a..cfd205a9d 100644
--- a/src/laws.c
+++ b/src/laws.c
@@ -2162,13 +2162,8 @@ int banner_cmd(unit * u, struct order *ord)
 
     init_order(ord, NULL);
     s = getstrtoken();
-    if (!s || !s[0]) {
-        cmistake(u, ord, 125, MSG_EVENT);
-    }
-    else {
-        faction_setbanner(u->faction, s);
-        ADDMSG(&u->faction->msgs, msg_message("changebanner", "value", s));
-    }
+    faction_setbanner(u->faction, s);
+    ADDMSG(&u->faction->msgs, msg_message("changebanner", "value", s));
 
     return 0;
 }