From 0a5658fe2b973d7a5cc13c038a4205472cf7f377 Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Mon, 1 Jul 2019 14:09:42 +0900 Subject: [PATCH] Revert "[Tizen] Fix the crash when adding new scene during core event processing" This reverts commit b224e05852b5c5508e6ff8c2a46978846340b5e6. --- dali/internal/common/core-impl.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp index 0e5c110..c1e7fde 100644 --- a/dali/internal/common/core-impl.cpp +++ b/dali/internal/common/core-impl.cpp @@ -268,12 +268,8 @@ void Core::ProcessEvents() // Signal that any messages received will be flushed soon mUpdateManager->EventProcessingStarted(); - // Scene could be added or removed while processing the events - // Copy the Scene container locally to avoid possibly invalid iterator - std::vector scenes = mScenes; - // process events in all scenes - for( auto iter = scenes.begin(); iter != scenes.end(); ++iter ) + for( auto iter = mScenes.begin(); iter != mScenes.end(); ++iter ) { (*iter)->ProcessEvents(); } @@ -281,7 +277,7 @@ void Core::ProcessEvents() mNotificationManager->ProcessMessages(); // Emit signal here to inform listeners that event processing has finished. - for( auto iter = scenes.begin(); iter != scenes.end(); ++iter ) + for( auto iter = mScenes.begin(); iter != mScenes.end(); ++iter ) { (*iter)->EmitEventProcessingFinishedSignal(); } @@ -293,7 +289,7 @@ void Core::ProcessEvents() mRelayoutController->Relayout(); // Rebuild depth tree after event processing has finished - for( auto iter = scenes.begin(); iter != scenes.end(); ++iter ) + for( auto iter = mScenes.begin(); iter != mScenes.end(); ++iter ) { (*iter)->RebuildDepthTree(); } -- 2.7.4