From e979abd6ccc120cddcef11e535607462b6bc2adc Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Mon, 12 Jan 2015 18:29:12 +0100 Subject: Fix some crashes during theme (re)loading Change-Id: I01405fbe86a48ae79f2cbe633b89f2dcfb1ef266 Signed-off-by: Vojtech Bocek --- gui/action.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gui/action.cpp') diff --git a/gui/action.cpp b/gui/action.cpp index c298d02af..8ea1dae82 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -385,8 +385,9 @@ int GUIAction::doActions() } else { - for (it = mActions.begin(); it != mActions.end(); ++it) - doAction(*it); + const size_t cnt = mActions.size(); + for (size_t i = 0; i < cnt; ++i) + doAction(mActions[i]); } return 0; @@ -484,7 +485,6 @@ int GUIAction::reload(std::string arg) int check = 0, ret_val = 0; std::string theme_path; - operation_start("Reload Theme"); theme_path = DataManager::GetSettingsStoragePath(); if (PartitionManager.Mount_By_Path(theme_path.c_str(), 1) < 0) { LOGERR("Unable to mount %s during reload function startup.\n", theme_path.c_str()); @@ -502,7 +502,6 @@ int GUIAction::reload(std::string arg) ret_val = 1; } } - operation_end(ret_val); return 0; } -- cgit v1.2.3