Merge branch 'master' into jgrpp

# Conflicts: # src/fios_gui.cpp # src/lang/english.txt # src/lang/german.txt
2019-02-02 01:27:56 +00:00
parent ec736d8b40 fa53abe864
commit 9d3b77c5a2
103 changed files with 957 additions and 491 deletions
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -182,6 +182,7 @@ struct GameOptionsWindow : Window {
 	~GameOptionsWindow()
 	{
 		DeleteWindowById(WC_CUSTOM_CURRENCY, 0);
+		DeleteWindowByClass(WC_TEXTFILE);
 		if (this->reload) _switch_mode = SM_MENU;
 	}