Skip to content
Snippets Groups Projects
Commit e9eff2b0 authored by callum's avatar callum
Browse files

SOCIAL-808 FIX Crash on exit in LLMediaCtrl

parent 5f224ed8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llmediactrl.cpp
+ 2
− 4
View file @ e9eff2b0
...@@ -153,8 +153,6 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) : ...@@ -153,8 +153,6 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) :
LLMediaCtrl::~LLMediaCtrl() LLMediaCtrl::~LLMediaCtrl()
{ {
delete mContextMenu;
if (mMediaSource) if (mMediaSource)
{ {
mMediaSource->remObserver( this ); mMediaSource->remObserver( this );
...@@ -389,8 +387,8 @@ void LLMediaCtrl::onFocusLost() ...@@ -389,8 +387,8 @@ void LLMediaCtrl::onFocusLost()
// //
BOOL LLMediaCtrl::postBuild () BOOL LLMediaCtrl::postBuild ()
{ {
mContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>( mContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>(
"menu_media_ctrl.xml", LLMenuGL::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance()); "menu_media_ctrl.xml", LLMenuGL::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance());
setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2)); setVisibleCallback(boost::bind(&LLMediaCtrl::onVisibilityChange, this, _2));
return TRUE; return TRUE;
} }
......
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