summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-02-05 09:51:42 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-19 14:20:32 +0100
commit9ea9d57bbf3b169d7bee5d2c36a2e0a4b26c965b (patch)
tree15324010ad5bcd7eb131d1095e38cef3220ef6d7
parent3d4980312fb08974b040ef7a892576a33a2a23d9 (diff)
Doc: Fix faulty snippet in Video Overview page
This change modifies setVideoSurface() in the snippet code to be a bit more robust. Task-number: QTBUG-29383 Change-Id: I2c691f19fe8f0912c1287597045da3a5579d2108 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
-rw-r--r--src/multimedia/doc/snippets/multimedia-snippets/video.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp
index 68dca0d01..8faf1aeab 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp
@@ -86,8 +86,12 @@ public:
void setVideoSurface(QAbstractVideoSurface *surface)
{
+ if (m_surface != surface && m_surface && m_surface->isActive()) {
+ m_surface->stop();
+ }
m_surface = surface;
- m_surface->start(m_format);
+ if (m_surface)
+ m_surface->start(m_format);
}
// ...