From cf50da57422f70059a928f34ca731f18f569eab9 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 12 Jan 2015 21:59:07 -0600 Subject: Fix handling of custom themes after decrypt Loading a custom theme from the decrypt action was preventing the runPage function from exiting. This moves the loading of a custom theme out of the action. Change-Id: I86904b63a67a25ded56e3e1e569fe906264dc055 --- twrp.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'twrp.cpp') diff --git a/twrp.cpp b/twrp.cpp index 35404c34d..3489f8cfc 100644 --- a/twrp.cpp +++ b/twrp.cpp @@ -278,6 +278,9 @@ int main(int argc, char **argv) { LOGINFO("Is encrypted, do decrypt page first\n"); if (gui_startPage("decrypt") != 0) { LOGERR("Failed to start decrypt GUI page.\n"); + } else { + // Check for and load custom theme if present + gui_loadCustomResources(); } } else if (datamedia) { if (tw_get_default_metadata(DataManager::GetSettingsStoragePath().c_str()) != 0) { -- cgit v1.2.3