From: Mario Date: Tue, 16 Dec 2014 00:40:42 +0000 (+0000) Subject: Merge branch 'sev/menu_image_fix' into 'master' X-Git-Tag: xonotic-v0.8.0~71 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9179659ce2defb99b5a599ef799bb7905824b9bc;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'sev/menu_image_fix' into 'master' Sev/menu image fix I noticed a few error messages during start-up (see below). These are caused by a XonoticScreenshotImage object, which is initialized with an empty (string_null) image source. On a resizeNotify call, the null string is handed down a long sequence of functions and ultimately causes the errors. This branch adds a check to the Image base class to prevent this. > FS_OpenVirtualFile("dds/gfx/menu/luminos/.dds", true): nasty filename rejected > FS_OpenVirtualFile("gfx/menu/luminos/.tga", true): nasty filename rejected > FS_OpenVirtualFile("gfx/menu/luminos/.png", true): nasty filename rejected > FS_OpenVirtualFile("gfx/menu/luminos/.jpg", true): nasty filename rejected > FS_OpenVirtualFile("gfx/menu/luminos/.pcx", true): nasty filename rejected > FS_OpenVirtualFile("menu/luminos/.tga", true): nasty filename rejected > FS_OpenVirtualFile("menu/luminos/.png", true): nasty filename rejected > FS_OpenVirtualFile("menu/luminos/.jpg", true): nasty filename rejected > FS_OpenVirtualFile("menu/luminos/.pcx", true): nasty filename rejected > FS_OpenVirtualFile("gfx/menu/luminos/.lmp", false): nasty filename rejected See merge request !56 --- 9179659ce2defb99b5a599ef799bb7905824b9bc