thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Fix loading gui-icons.dat from Windows resource

Browse source
This commit is contained in:
Eugene Sandulenko 2021-11-14 22:22:21 +01:00
parent 4c8c5f12fa
commit 3d82c0e8b4
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gui/gui-manager.cpp
View file

@ -25,6 +25,7 @@
#include "common/util.h" #include "common/util.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/algorithm.h" #include "common/algorithm.h"
#include "common/file.h"
#include "common/rect.h" #include "common/rect.h"
#include "common/textconsole.h" #include "common/textconsole.h"
#include "common/translation.h" #include "common/translation.h"
@ -163,7 +164,17 @@ void GuiManager::initIconsSet() {
if (!fs) if (!fs)
fs = new Common::FSNode(fname); fs = new Common::FSNode(fname);
dat = Common::makeZipArchive(*fs); if (fs) {
dat = Common::makeZipArchive(*fs);
} else {
// We could be on Windows with gui-icons.dat file as an
// embedded resource. Try it.
Common::File *in = new Common::File;
in->open(fname);
if (in->isOpen())
dat = Common::makeZipArchive(in);
}
if (!dat) { if (!dat) {
warning("GUI: Could not find '%s'", path.c_str()); warning("GUI: Could not find '%s'", path.c_str());