diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-09 15:09:07 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-09 18:35:34 (GMT) |
| commit | 869323e1d6e7524050e2240fdc1bedb7b7639444 (patch) | |
| tree | 24e3e514cafda5d614b87be7b3062deaabb9c5f1 /src | |
| parent | 5edf3073f69020c7248a9e597811e1020b047d98 (diff) | |
| download | Qt-869323e1d6e7524050e2240fdc1bedb7b7639444.zip Qt-869323e1d6e7524050e2240fdc1bedb7b7639444.tar.gz Qt-869323e1d6e7524050e2240fdc1bedb7b7639444.tar.bz2 | |
Removed infinite recursion from Phonon::MMF::MediaObject::errorType
Reviewed-by: Frans Englich
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.cpp b/src/3rdparty/phonon/mmf/abstractplayer.cpp index de2722d..d679e54 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractplayer.cpp @@ -134,7 +134,7 @@ void MMF::AbstractPlayer::setError(Phonon::ErrorType error, Phonon::ErrorType MMF::AbstractPlayer::errorType() const { const Phonon::ErrorType result = (ErrorState == m_state) - ? errorType() : NoError; + ? m_error : NoError; return result; } |