Commit e5a8326e authored by hausmann@webkit.org's avatar hausmann@webkit.org

2008-11-05 Jeff Cook <cookiecaper@gmail.com>

        Reviewed by Simon Hausmann and Tor Arne.

        Fix crash in the Qt port when unloading swfdec and Flash 10
        by reordering window destruction and plugin stop.

        See https://bugs.webkit.org/show_bug.cgi?id=20779

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38125 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f9c88735
2008-11-05 Jeff Cook <cookiecaper@gmail.com>
Reviewed by Simon Hausmann and Tor Arne.
Fix crash in the Qt port when unloading swfdec and Flash 10
by reordering window destruction and plugin stop.
See https://bugs.webkit.org/show_bug.cgi?id=20779
* plugins/qt/PluginViewQt.cpp:
(WebCore::PluginView::stop):
2008-11-05 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø
......
......@@ -228,8 +228,6 @@ void PluginView::stop()
// Clear the window
m_npWindow.window = 0;
delete (NPSetWindowCallbackStruct *)m_npWindow.ws_info;
m_npWindow.ws_info = 0;
if (m_plugin->pluginFuncs()->setwindow && !m_plugin->quirks().contains(PluginQuirkDontSetNullWindowHandleOnDestroy)) {
PluginView::setCurrentPluginView(this);
setCallingPlugin(true);
......@@ -238,6 +236,9 @@ void PluginView::stop()
PluginView::setCurrentPluginView(0);
}
delete (NPSetWindowCallbackStruct *)m_npWindow.ws_info;
m_npWindow.ws_info = 0;
// Destroy the plugin
{
PluginView::setCurrentPluginView(this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment