Merge branch 'master' into jgrpp

# Conflicts: # src/vehicle_cmd.cpp
2019-01-31 02:04:02 +00:00
parent 98aa58a6b4 ba38a7ca65
commit 255b6adfc9
23 changed files with 256 additions and 160 deletions
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -76,7 +76,7 @@ struct ContentTextfileWindow : public TextfileWindow {

 void ShowContentTextfileWindow(TextfileType file_type, const ContentInfo *ci)
 {
-	DeleteWindowByClass(WC_TEXTFILE);
+	DeleteWindowById(WC_TEXTFILE, file_type);
 	new ContentTextfileWindow(file_type, ci);
 }