Merge branch 'master' into devel

2015-10-27 23:16:32 +00:00
parent eaec5c22ab 1bc019f79d
commit 363f30cd0a
1 changed files with 1 additions and 1 deletions
@@ -863,7 +863,7 @@ Void VideoSubWindow::zoomToFactor( Double factor, QPoint center )

 Void VideoSubWindow::scaleView( Double scale, QPoint center )
 {
-  Q_ASSERT( m_cViewArea->image() );
+  Q_ASSERT( !m_cViewArea->image().isNull() );
  if( scale != 1.0 )
  {
    Double usedScale;