diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 20:59:37 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 20:59:37 (GMT) |
| commit | f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3 (patch) | |
| tree | cfef52067762aaf362cd4bc94034edd0290e539b /examples/multimedia | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| parent | 600a19ab7cecc32a3b31c873900303005fb3d672 (diff) | |
| download | Qt-f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3.zip Qt-f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3.tar.gz Qt-f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
Diffstat (limited to 'examples/multimedia')
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 4a408a0..4e5f2a3 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -315,6 +315,11 @@ void InputTest::readMore() void InputTest::toggleMode() { // Change bewteen pull and push modes + if (m_input != 0) { + disconnect(m_input, 0, this, 0); + m_input = 0; + } + m_audioInput->stop(); if (m_pullMode) { |