From 8b41f1b3067e368e80be4698a8ecd0593776e0d4 Mon Sep 17 00:00:00 2001
From: BeagleJoe <BeagleJoe@users.noreply.github.com>
Date: Thu, 11 Nov 2021 04:00:00 -0600
Subject: [PATCH] workaround for exit crash (#6360)

---
 .../patches/speed_dreams-2.2.3.patchset       | 50 +++++++++++++++++--
 .../speed-dreams/speed_dreams-2.2.3.recipe    |  2 +-
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/games-sports/speed-dreams/patches/speed_dreams-2.2.3.patchset b/games-sports/speed-dreams/patches/speed_dreams-2.2.3.patchset
index e8ba667e6..fb62d996d 100644
--- a/games-sports/speed-dreams/patches/speed_dreams-2.2.3.patchset
+++ b/games-sports/speed-dreams/patches/speed_dreams-2.2.3.patchset
@@ -1,4 +1,4 @@
-From 3b3d2b8c25ee3f1fd95eb99211b9960f7de8c2e2 Mon Sep 17 00:00:00 2001
+From fb4561632afe38122e537eb64871ed61c2dd3756 Mon Sep 17 00:00:00 2001
 From: beaglejoe <BeagleJoe13@gmail.com>
 Date: Sun, 8 Aug 2021 11:07:37 -0500
 Subject: Fix for building base only
@@ -37,7 +37,7 @@ index 15606e3..d69190e 100644
 2.30.2
 
 
-From fb19af401a79a0a87d17d77cea5027d505e4c870 Mon Sep 17 00:00:00 2001
+From 96c779c891895cd5265b424e58de8a7397b05025 Mon Sep 17 00:00:00 2001
 From: beaglejoe <BeagleJoe13@gmail.com>
 Date: Wed, 8 Sep 2021 10:12:59 -0500
 Subject: Set throttle and brake to mouse
@@ -397,7 +397,7 @@ index 21bf72f..0a4404b 100644
 2.30.2
 
 
-From 04bdd507608ac22ff977c48ba8358d528220a05d Mon Sep 17 00:00:00 2001
+From ffb48f340e727340ed7549c2ed853ce1428fd277 Mon Sep 17 00:00:00 2001
 From: beaglejoe <BeagleJoe13@gmail.com>
 Date: Sat, 11 Sep 2021 17:46:05 -0500
 Subject: Fix for SDL2
@@ -531,7 +531,7 @@ index 1c21c8f..b8c48b8 100644
 2.30.2
 
 
-From 18f5e3a90f5dbd32c00d1a58320358256160534c Mon Sep 17 00:00:00 2001
+From 0d490187abbf90772e3dcca1d59a56aa530df5b1 Mon Sep 17 00:00:00 2001
 From: beaglejoe <BeagleJoe13@gmail.com>
 Date: Tue, 21 Sep 2021 01:14:19 -0500
 Subject: fix for crash at exit
@@ -564,3 +564,45 @@ index 1101f60..bab4f9f 100644
 -- 
 2.30.2
 
+
+From 9bf4e49dc36d7b7108ea080c54a1a795de543df6 Mon Sep 17 00:00:00 2001
+From: beaglejoe <BeagleJoe13@gmail.com>
+Date: Tue, 2 Nov 2021 10:07:05 -0500
+Subject: workaround for exit crash
+
+
+diff --git a/src/libs/tgfclient/guiscreen.cpp b/src/libs/tgfclient/guiscreen.cpp
+index b8c48b8..fe52fba 100644
+--- a/src/libs/tgfclient/guiscreen.cpp
++++ b/src/libs/tgfclient/guiscreen.cpp
+@@ -52,6 +52,7 @@ static int GfViewWidth;
+ static int GfViewHeight;
+ static int GfScrCenX;
+ static int GfScrCenY;
++static SDL_GLContext GLContext = NULL;
+ 
+ // The screen surface.
+ static SDL_Surface *PScreenSurface = NULL;
+@@ -460,7 +461,7 @@ SDL_Surface* gfScrCreateWindow(int nWinWidth, int nWinHeight, int nTotalDepth,in
+     //SDL_RenderPresent(renderer);
+ 
+     /* Create OpenGL context */
+-    SDL_GL_CreateContext(GfuiWindow);
++    GLContext = SDL_GL_CreateContext(GfuiWindow);
+ 
+     // If specified, try best possible settings.
+     PScreenSurface = SDL_CreateRGBSurface(0, nWinWidth, nWinHeight, nTotalDepth,
+@@ -1179,6 +1180,10 @@ void GfScrShutdown(void)
+ {
+     GfLogTrace("Shutting down screen.\n");
+ 
++	SDL_GL_MakeCurrent(GfuiWindow, GLContext);
++	SDL_GL_DeleteContext(GLContext);
++	GLContext = NULL;
++
+     // Shutdown SDL video sub-system.
+     SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
+ 
+-- 
+2.30.2
+
diff --git a/games-sports/speed-dreams/speed_dreams-2.2.3.recipe b/games-sports/speed-dreams/speed_dreams-2.2.3.recipe
index b4f417297..79cef65b3 100644
--- a/games-sports/speed-dreams/speed_dreams-2.2.3.recipe
+++ b/games-sports/speed-dreams/speed_dreams-2.2.3.recipe
@@ -5,7 +5,7 @@ teaching activity, around physics and AI."
 HOMEPAGE="http://www.speed-dreams.org/"
 COPYRIGHT="2009-2018 Jean-Philippe Meuret"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://sourceforge.net/projects/speed-dreams/files/$portVersion/speed-dreams-src-base-$portVersion-r7616.tar.xz"
 
 CHECKSUM_SHA256="c67e48a083cd86f6c0062f0b38ed91a5d25274ea8aa656ee182f3f5074e96ff0"