summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2010-12-23 15:01:00 +1000
committerMichael Goddard <michael.goddard@nokia.com>2010-12-23 16:01:07 +1000
commitc88952cf795465529964ba5ac5c959e83f5d4c64 (patch)
tree38f3a4eafa266cb2821b0c14d5e661fa2e990c21 /tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
parent5a31f30c177b7c99a6173bea3151931f1c6080f6 (diff)
Make sure error conditions are also handled well in MMK plugin.
When we fail a load, make sure we don't keep the previous loading state around, and properly handle the case where start() is called before the effect is actually loaded, and a subsequent error occurs. Change-Id: I5ea8ba7b51ae67250be8a6823e2b56598bc429d1 Task-number: MOBILITY-2199 Reviewed-by: Chris Adams
Diffstat (limited to 'tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp')
-rw-r--r--tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
index 265b17f432..30e64c9159 100644
--- a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
+++ b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
@@ -191,7 +191,8 @@ void QFeedbackTestPlugin::setLoaded(QFeedbackFileEffect *effect, bool load)
void QFeedbackTestPlugin::setEffectState(QFeedbackFileEffect *effect, QFeedbackEffect::State state)
{
Q_UNUSED(effect)
- mFileState = state;
+ if (effect->source() == QUrl("load")) // we only change state for good effects
+ mFileState = state;
}
QFeedbackEffect::State QFeedbackTestPlugin::effectState(const QFeedbackFileEffect *effect)