summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2015-04-16 08:09:56 -0700
committerSzabolcs David <davidsz@inf.u-szeged.hu>2015-04-20 14:02:57 +0000
commit1ec438cb947b8079af71d306ab7e329ec9062f8e (patch)
treea59352cc27cca49ccd25d1b9bd0bb1ac127e52e1
parentf5ec28285ab7f71d6d75af963ae499603da6630e (diff)
Fix the crash on exit with --single-process
In single process mode, RenderProcessObserverHelper got destroyed before its host. Change-Id: Ic2f36de3218f5ad6781610dbf677675b7e41a9eb Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
-rw-r--r--src/core/user_script_controller_host.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/user_script_controller_host.cpp b/src/core/user_script_controller_host.cpp
index 69284dbe..2f4a55c2 100644
--- a/src/core/user_script_controller_host.cpp
+++ b/src/core/user_script_controller_host.cpp
@@ -207,6 +207,8 @@ UserScriptControllerHost::UserScriptControllerHost()
UserScriptControllerHost::~UserScriptControllerHost()
{
+ Q_FOREACH (content::RenderProcessHost *renderer, m_observedProcesses)
+ renderer->RemoveObserver(m_renderProcessObserver.data());
}
} // namespace