fixed bug with accessing string buffer that was already free()'ed

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index bfe53c37c829e388dbf5ffb2bb197f9be720ef2e..574809781e92dcbbb4cf5a75c78b34f65dc5f220 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -22,6 +22,7 @@
 #include "files.h"
 #include "tools.h"
 #include "screens.h"
+#include "init.h"
 
 struct NetworkClientPlayerInfo
 {
@@ -693,6 +694,9 @@ static void Handle_OP_START_PLAYING()
     level_nr = new_level_nr;
   }
 
+  /* needed if level set of network game changed graphics, sounds or music */
+  ReloadCustomArtwork(0);
+
   TapeErase();
 
   if (network_level.use_network_level_files)
@@ -820,6 +824,9 @@ static void Handle_OP_LEVEL_FILE()
   printf("OP_LEVEL_FILE: %d\n", player_nr);
 
   leveldir_identifier = getStringCopy(getNetworkBufferString(read_buffer));
+
+  InitNetworkLevelDirectory(leveldir_identifier);
+
   network_level_dir   = getNetworkLevelDir(leveldir_identifier);
 
   file_info->nr       = getNetworkBuffer16BitInteger(read_buffer);
@@ -828,8 +835,6 @@ static void Handle_OP_LEVEL_FILE()
   file_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
   file_info->filename = getPath2(network_level_dir, file_info->basename);
 
-  InitNetworkLevelDirectory(leveldir_identifier);
-
   getNetworkBufferFile(read_buffer, file_info->filename);
 
   use_custom_template = getNetworkBuffer8BitInteger(read_buffer);