Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h

src/video/sdl2_v.cpp

@@ -517,10 +517,10 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize)
 			return false;
 		}
 
-		char icon_path[MAX_PATH];
-		if (FioFindFullPath(icon_path, lastof(icon_path), BASESET_DIR, "openttd.32.bmp") != nullptr) {
+		std::string icon_path = FioFindFullPath(BASESET_DIR, "openttd.32.bmp");
+		if (!icon_path.empty()) {
 			/* Give the application an icon */
-			SDL_Surface *icon = SDL_LoadBMP(icon_path);
+			SDL_Surface *icon = SDL_LoadBMP(icon_path.c_str());
 			if (icon != nullptr) {
 				/* Get the colourkey, which will be magenta */
 				uint32 rgbmap = SDL_MapRGB(icon->format, 255, 0, 255);