From 3454ade92db48236057814f0ade5fa45bd57cd62 Mon Sep 17 00:00:00 2001 From: Dees Troy Date: Tue, 20 Jan 2015 19:21:04 +0000 Subject: Use /twres instead of /res for theme resources AOSP and other ROM trees now do a rm -rf of the res folder during the ramdisk creation process that removes the TWRP resources. Using /twres instead of /res works around this issue making TWRP more compatible with AOSP and other build trees. Change-Id: I0d4c7e06ca381ac5aa0069b6f2b8c47f7dec49e7 --- gui/pages.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gui/pages.cpp') diff --git a/gui/pages.cpp b/gui/pages.cpp index 94c351be2..8fef7b4c8 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -644,11 +644,11 @@ int PageSet::CheckInclude(ZipArchive* package, xml_document<> *parentDoc) if (!attr) break; - LOGINFO("PageSet::CheckInclude loading filename: '%s'\n", filename.c_str()); if (!package) { // We can try to load the XML directly... - filename = "/res/"; + filename = TWRES; filename += attr->value(); + LOGINFO("PageSet::CheckInclude loading filename: '%s'\n", filename.c_str()); struct stat st; if(stat(filename.c_str(),&st) != 0) { LOGERR("Unable to locate '%s'\n", filename.c_str()); @@ -668,6 +668,7 @@ int PageSet::CheckInclude(ZipArchive* package, xml_document<> *parentDoc) close(fd); } else { filename += attr->value(); + LOGINFO("PageSet::CheckInclude loading filename: '%s'\n", filename.c_str()); const ZipEntry* ui_xml = mzFindZipEntry(package, filename.c_str()); if (ui_xml == NULL) { @@ -1094,7 +1095,7 @@ int PageManager::ReloadPackage(std::string name, std::string package) if (LoadPackage(name, package, "main") != 0) { - LOGERR("Failed to load package.\n"); + LOGERR("Failed to load package '%s'.\n", package.c_str()); mPageSets.insert(std::pair(name, set)); return -1; } -- cgit v1.2.3