diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 15:07:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 15:07:36 (GMT) |
| commit | c6ac9fe2e8d219bb9694efaf5b25ec5108fb8fa6 (patch) | |
| tree | 917da74f21248a79c2479d5cbe3ba869ea00ff96 /src/3rdparty/phonon/ds9 | |
| parent | 8d5c19f024c55fca61c9cb343180e9db9d79929a (diff) | |
| parent | 647b3395e41827c232fa9203ee0590da2b6d257a (diff) | |
| download | Qt-c6ac9fe2e8d219bb9694efaf5b25ec5108fb8fa6.zip Qt-c6ac9fe2e8d219bb9694efaf5b25ec5108fb8fa6.tar.gz Qt-c6ac9fe2e8d219bb9694efaf5b25ec5108fb8fa6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix for torn off menus that were way too big
Compile fix for Windows Mobile and OpenGLES2
Fixed failure to store certain image formats as jpeg
Fixa few warnings on mingw
Added QImage::bitPlaneCount().
Diffstat (limited to 'src/3rdparty/phonon/ds9')
| -rw-r--r-- | src/3rdparty/phonon/ds9/backendnode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/backendnode.cpp b/src/3rdparty/phonon/ds9/backendnode.cpp index 3afcafa..737ab7b 100644 --- a/src/3rdparty/phonon/ds9/backendnode.cpp +++ b/src/3rdparty/phonon/ds9/backendnode.cpp @@ -67,7 +67,7 @@ namespace Phonon if (info.pGraph) { HRESULT hr = info.pGraph->RemoveFilter(filter); - if (hr == VFW_E_NOT_STOPPED && m_mediaObject) { + if (FAILED(hr) && m_mediaObject) { m_mediaObject->ensureStopped(); hr = info.pGraph->RemoveFilter(filter); |