Skip to content
Snippets Groups Projects
Commit c1943e5e authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-16161 Don't process new plugin messages on shutdown

Some pending messages might try to update non-existing view or cause a pop up, neither should be avaliable by this point, so just don't process them
parent 404c4987
No related branches found
No related tags found
No related merge requests found
...@@ -192,6 +192,7 @@ void LLPluginProcessParent::shutdown() ...@@ -192,6 +192,7 @@ void LLPluginProcessParent::shutdown()
&& state != STATE_ERROR) && state != STATE_ERROR)
{ {
(*it).second->setState(STATE_GOODBYE); (*it).second->setState(STATE_GOODBYE);
(*it).second->mOwner = NULL;
} }
if (state != STATE_DONE) if (state != STATE_DONE)
{ {
...@@ -407,7 +408,10 @@ void LLPluginProcessParent::idle(void) ...@@ -407,7 +408,10 @@ void LLPluginProcessParent::idle(void)
mMessagePipe->pumpOutput(); mMessagePipe->pumpOutput();
// Only do input processing here if this instance isn't in a pollset. // Only do input processing here if this instance isn't in a pollset.
if(!mPolledInput) // If we are shutting down plugin, owner is null and we can't process
// input, we are here only to send shutdown_plugin message
if(!mPolledInput
&& mState != STATE_GOODBYE)
{ {
mMessagePipe->pumpInput(); mMessagePipe->pumpInput();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment