Include patch to not crash when combining -record -pistolstart

3 files changed, 34 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 740d0f6fe958..6aa4f48e1ede 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = crispy-doom
 	pkgdesc = Vanilla-compatible enhanced Doom engine
 	pkgver = 5.9.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://fabiangreffrath.github.io/crispy-doom
 	install = crispy-doom.install
 	arch = i686
@@ -17,7 +17,9 @@ pkgbase = crispy-doom
 	optdepends = freedoom1: Free Ultimate Doom-compatible game
 	optdepends = freedoom2: Free Doom II-compatible game
 	source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.9.2.tar.gz
+	source = 0001-prevent-crashes-with-simultaneous-use-of-record-and-.patch
 	b2sums = 63d9a89d6099485c79ff4cad69975de790b32a4ece4bded172ebf771a2bf1b4dcd21ab58383ca3c5eea32a4eff72e65ec0e3a283c85f1bc62be680de04f88e52
+	b2sums = b1e77adf37f22f1ef47b614e27e6158ac7c19bf5b7adfa97a434b04f514a1e5cb7f1f77024a373392c836c5456c87b5bb6f7240566389574392a2e5f05d63d5d
 
 pkgname = crispy-doom
 
diff --git a/0001-prevent-crashes-with-simultaneous-use-of-record-and-.patch b/0001-prevent-crashes-with-simultaneous-use-of-record-and-.patch
new file mode 100644
index 000000000000..e2a83b3774c5
--- /dev/null
+++ b/0001-prevent-crashes-with-simultaneous-use-of-record-and-.patch
@@ -0,0 +1,26 @@
+From 211dd1a8b36dc5fecd4bc5149f54ffc1a6a85315 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Tue, 22 Sep 2020 12:18:33 +0200
+Subject: [PATCH] prevent crashes with simultaneous use of -record and
+ -pistolstart
+
+Thanks Spie812.
+---
+ src/doom/g_game.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/doom/g_game.c b/src/doom/g_game.c
+index 934d8bf7..84332889 100644
+--- a/src/doom/g_game.c
++++ b/src/doom/g_game.c
+@@ -886,6 +886,7 @@ void G_DoLoadLevel (void)
+             const char message[] = "The -pistolstart option is not suppported"
+                                    " for demos and\n"
+                                    " network play.";
++            if (!demo_p) demorecording = false;
+             I_Error(message);
+         }
+     }
+-- 
+2.28.0
+
diff --git a/PKGBUILD b/PKGBUILD
index d328dd656343..9257b108095f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=crispy-doom
 pkgdesc="Vanilla-compatible enhanced Doom engine"
 pkgver=5.9.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://fabiangreffrath.github.io/crispy-doom"
 license=('GPL2')
@@ -13,8 +13,10 @@ optdepends=('freedm: Free deathmatch game'
             'freedoom1: Free Ultimate Doom-compatible game'
             'freedoom2: Free Doom II-compatible game')
 install=crispy-doom.install
-source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz)
-b2sums=('63d9a89d6099485c79ff4cad69975de790b32a4ece4bded172ebf771a2bf1b4dcd21ab58383ca3c5eea32a4eff72e65ec0e3a283c85f1bc62be680de04f88e52')
+source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz
+        0001-prevent-crashes-with-simultaneous-use-of-record-and-.patch)
+b2sums=('63d9a89d6099485c79ff4cad69975de790b32a4ece4bded172ebf771a2bf1b4dcd21ab58383ca3c5eea32a4eff72e65ec0e3a283c85f1bc62be680de04f88e52'
+        'b1e77adf37f22f1ef47b614e27e6158ac7c19bf5b7adfa97a434b04f514a1e5cb7f1f77024a373392c836c5456c87b5bb6f7240566389574392a2e5f05d63d5d')
 
 prepare() {
   cd "$pkgname-$pkgname-$pkgver"