[vlc-devel] commit: skins2: correct crashes when using zoom and multiple video tags ( Erwan Tulou )
git version control
git at videolan.org
Fri Jun 5 16:09:50 CEST 2009
vlc | branch: 1.0-bugfix | Erwan Tulou <brezhoneg1 at yahoo.fr> | Fri Jun 5 14:37:37 2009 +0200| [acfeac927692b0b6db273e8431a31de97b2ce542] | committer: Rémi Denis-Courmont
skins2: correct crashes when using zoom and multiple video tags
Fixes #2821
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 8b70a12e22fae1ecdffdc43a93d56ca31419697d)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=acfeac927692b0b6db273e8431a31de97b2ce542
---
modules/gui/skins2/controls/ctrl_video.cpp | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/modules/gui/skins2/controls/ctrl_video.cpp b/modules/gui/skins2/controls/ctrl_video.cpp
index 894336a..ce62d72 100644
--- a/modules/gui/skins2/controls/ctrl_video.cpp
+++ b/modules/gui/skins2/controls/ctrl_video.cpp
@@ -222,16 +222,19 @@ void CtrlVideo::detachVoutWindow( )
void CtrlVideo::resizeInnerVout( )
{
- WindowManager &rWindowManager =
- getIntf()->p_sys->p_theme->getWindowManager();
- TopWindow* pWin = getWindow();
+ if( m_pVoutWindow )
+ {
+ WindowManager &rWindowManager =
+ getIntf()->p_sys->p_theme->getWindowManager();
+ TopWindow* pWin = getWindow();
- const Position *pPos = getPosition();
+ const Position *pPos = getPosition();
- m_pVoutWindow->resize( pPos->getWidth(), pPos->getHeight() );
- m_pVoutWindow->move( pPos->getLeft(), pPos->getTop() );
+ m_pVoutWindow->resize( pPos->getWidth(), pPos->getHeight() );
+ m_pVoutWindow->move( pPos->getLeft(), pPos->getTop() );
- rWindowManager.show( *pWin );
- m_pVoutWindow->show();
+ rWindowManager.show( *pWin );
+ m_pVoutWindow->show();
+ }
}
More information about the vlc-devel
mailing list