Merge branch 'master' into jgrpp-beta

2021-10-29 17:56:32 +01:00
parent da282c3ecc d0bcb9839a
commit 24c6dfe872
4 changed files with 6 additions and 6 deletions
--- a/src/network/network_content_gui.h
+++ b/src/network/network_content_gui.h
@@ -22,8 +22,8 @@ protected:
 	uint total_files;      ///< Number of files to download
 	uint downloaded_files; ///< Number of files downloaded

-	uint32 cur_id; ///< The current ID of the downloaded file
-	char name[48]; ///< The current name of the downloaded file
+	uint32 cur_id;    ///< The current ID of the downloaded file
+	std::string name; ///< The current name of the downloaded file

 public:
 	/**