summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbigbiff <bigbiff@teamw.in>2014-11-16 03:03:52 +0100
committerbigbiff <bigbiff@teamw.in>2014-11-16 03:07:22 +0100
commit85939e5a1b694b8ee50bfd7702a9af81eb0eee1a (patch)
treee26ab7293df51d60e9e44b1403192ee0ca64d4e0
parentAdd lollipop decrypt support (diff)
downloadandroid_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.tar
android_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.tar.gz
android_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.tar.bz2
android_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.tar.lz
android_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.tar.xz
android_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.tar.zst
android_bootable_recovery-85939e5a1b694b8ee50bfd7702a9af81eb0eee1a.zip
Diffstat (limited to '')
-rw-r--r--gui/resources.cpp1
-rw-r--r--gui/resources.hpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/gui/resources.cpp b/gui/resources.cpp
index 4fce0ca44..5f3923d10 100644
--- a/gui/resources.cpp
+++ b/gui/resources.cpp
@@ -247,7 +247,6 @@ void ResourceManager::LoadResources(xml_node<>* resList, ZipArchive* pZip)
if (!resList)
return;
-
child = resList->first_node("resource");
while (child != NULL)
{
diff --git a/gui/resources.hpp b/gui/resources.hpp
index 3cb528176..54a1185c3 100644
--- a/gui/resources.hpp
+++ b/gui/resources.hpp
@@ -77,8 +77,8 @@ public:
virtual ~AnimationResource();
public:
- virtual void* GetResource(void) { return mSurfaces.at(0); }
- virtual void* GetResource(int entry) { return mSurfaces.at(entry); }
+ virtual void* GetResource(void) { return mSurfaces.empty() ? NULL : mSurfaces.at(0); }
+ virtual void* GetResource(int entry) { return mSurfaces.empty() ? NULL : mSurfaces.at(entry); }
virtual int GetResourceCount(void) { return mSurfaces.size(); }
protected: