Merge branch 'master' into server

89c7ffa6 · nanahira · be3b29ad · f5927932 · 89c7ffa6 · cab5a7a2
Commit 89c7ffa6 authored Feb 28, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

gframe/menu_handler.cpp gframe/menu_handler.cpp +1 -0

script script +1 -1

No files found.
--- a/gframe/menu_handler.cpp
+++ b/gframe/menu_handler.cpp
@@ -543,6 +543,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 						message.append(wlinebuf);
 					}
 				}
+				fclose(fp);
 				mainGame->SetStaticText(mainGame->stSinglePlayInfo, 200, mainGame->guiFont, message.c_str());
 				break;
 			}

--- a/script @ cab5a7a2
+++ b/script @ cab5a7a2
-Subproject commit 27fd14e4dfed96117edd7df9ec4b752bd2bf8186
+Subproject commit cab5a7a22f41a55d6e525f28713057166efcddff