aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorKari Salminen2008-10-22 20:29:17 +0000
committerKari Salminen2008-10-22 20:29:17 +0000
commit4d4042df36e316196269df98ed408186a945b803 (patch)
treeeda0a97bb65bb0c14f790adc6aa2cb846914182a /gui
parentb9709b579357ad876cb63481f28634390808f579 (diff)
downloadscummvm-rg350-4d4042df36e316196269df98ed408186a945b803.tar.gz
scummvm-rg350-4d4042df36e316196269df98ed408186a945b803.tar.bz2
scummvm-rg350-4d4042df36e316196269df98ed408186a945b803.zip
Shut up MSVC and add FIXMEs to Sword's listSaves and ThemeEngine's loadThemeXML.
svn-id: r34839
Diffstat (limited to 'gui')
-rw-r--r--gui/ThemeEngine.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 13fd1ea24d..2df6b5ec47 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -525,7 +525,8 @@ bool ThemeEngine::loadThemeXML(const Common::String &themeName) {
if (!node.exists() || !node.isReadable())
return false;
- Common::Archive *archive;
+ // FIXME: Should this be initialized to something else than NULL?
+ Common::Archive *archive = NULL;
if (node.getName().hasSuffix(".zip") && !node.isDirectory()) {
#ifdef USE_ZLIB
@@ -544,6 +545,8 @@ bool ThemeEngine::loadThemeXML(const Common::String &themeName) {
}
Common::File themercFile;
+ // FIXME: Possibly dereferencing a NULL pointer here if the node's
+ // name doesn't have a ".zip" suffix and the node is not a directory.
themercFile.open("THEMERC", *archive);
if (!themercFile.isOpen()) {
delete archive;