Fixed stupid segfault in cleanup due to mlx pointer and img pointer b…

…eing swapped in mlx_destroy_img()
Haliris · Aug 30, 2024 · abd0121 · abd0121
1 parent e71e46d
commit abd0121
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/maps/subject_test.cub b/maps/subject_test.cub
@@ -1,4 +1,4 @@
-NO ./assets/okan.xpm
+NO ./assets/dummy.xpm
 SO ./assets/yohurteb.xpm
 WE ./assets/okan.xpm
 EA ./assets/okan.xpm

diff --git a/srcs/cleanup.c b/srcs/cleanup.c
@@ -6,14 +6,22 @@
 /*   By: jteissie <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/27 17:04:32 by jteissie          #+#    #+#             */
-/*   Updated: 2024/08/29 17:45:39 by jteissie         ###   ########.fr       */
+/*   Updated: 2024/08/30 14:31:07 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "cub3d.h"
 
 static void	cleanup_textures(t_textdata *textures, void *mlx)
 {
+	if (textures->text_img[N])
+		mlx_destroy_image(mlx, textures->text_img[N]);
+	if (textures->text_img[S])
+		mlx_destroy_image(mlx, textures->text_img[S]);
+	if (textures->text_img[E])
+		mlx_destroy_image(mlx, textures->text_img[E]);
+	if (textures->text_img[W])
+		mlx_destroy_image(mlx, textures->text_img[W]);
 	if (textures->text_paths[N])
 		free(textures->text_paths[N]);
 	if (textures->text_paths[S])
@@ -22,14 +30,6 @@ static void	cleanup_textures(t_textdata *textures, void *mlx)
 		free(textures->text_paths[E]);
 	if (textures->text_paths[W])
 		free(textures->text_paths[W]);
-	if (textures->text_img[N])
-		mlx_destroy_image(textures->text_img[N], mlx);
-	if (textures->text_img[S])
-		mlx_destroy_image(textures->text_img[S], mlx);
-	if (textures->text_img[E])
-		mlx_destroy_image(textures->text_img[E], mlx);
-	if (textures->text_img[W])
-		mlx_destroy_image(textures->text_img[W], mlx);
 	free(textures);
 }
 

diff --git a/srcs/game_init.c b/srcs/game_init.c
@@ -6,7 +6,7 @@
 /*   By: jteissie <[email protected]>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/27 17:03:43 by jteissie          #+#    #+#             */
-/*   Updated: 2024/08/29 17:53:43 by jteissie         ###   ########.fr       */
+/*   Updated: 2024/08/30 14:30:35 by jteissie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */