Fix chrash when closing

This commit is contained in:
jfmcarreira committed 2014-12-10 01:58:07 +00:00
1 parent 9cef35c310
commit f10b9f06c7
5 files changed
+64 -80

No files matched your search

+13 -7
View File
@@ -176,13 +176,14 @@ Void StreamPropertiesSideBar::setData( PlaYUVerStream* pcStream )
// FramePropertiesSideBar
////////////////////////////////////////////////////////////////////////////////
FramePropertiesSideBar::FramePropertiesSideBar( QWidget* parent, Bool *pbIsPlaying ) :
QWidget( parent )
FramePropertiesSideBar::FramePropertiesSideBar( QWidget* parent, Bool* pbMainPlaySwitch ) :
QWidget( parent ),
pbMainPlaySwitch( pbMainPlaySwitch )
{
// -------------- Variables definition --------------
m_pcFrame = NULL;
m_iLastFrameType = -1;
m_pbIsPlaying = pbIsPlaying;
m_pbIsPlaying = false;
// Histogram area -----------------------------------------------------
@@ -401,10 +402,12 @@ QSize FramePropertiesSideBar::sizeHint() const
return bestSize( size() );
}
Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame )
Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame, Bool isPlaying )
{
m_pbIsPlaying = isPlaying;
if( !pcFrame )
{
m_pcFrame = NULL;
m_iLastFrameType = -1;
labelMeanValue->clear();
labelPixelsValue->clear();
@@ -479,8 +482,11 @@ Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame )
}
}
setEnabled( true );
m_pcFrame = pcFrame;
updateDataHistogram();
if( m_pcFrame != pcFrame || !(*pbMainPlaySwitch) )
{
m_pcFrame = pcFrame;
updateDataHistogram();
}
}
}
@@ -517,7 +523,7 @@ Void FramePropertiesSideBar::updateDataHistogram()
{
if( m_pcFrame->isValid() && isVisible() )
{
if( !(*m_pbIsPlaying) )
if( !( *pbMainPlaySwitch && m_pbIsPlaying ) )
{
// If a selection area is done in Image Editor and if the current
// image is the same in Image Viewer, then compute too the histogram