From 869323e1d6e7524050e2240fdc1bedb7b7639444 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 9 Nov 2009 15:09:07 +0000 Subject: Removed infinite recursion from Phonon::MMF::MediaObject::errorType Reviewed-by: Frans Englich --- src/3rdparty/phonon/mmf/abstractplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v0.12