From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Sun, 26 Jul 2015 22:43:04 +0000 (+0200)
Subject: Do not start a stopped combinable effect when it gets updated.
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=6c49c2a29bd9a8e35358f825d0cefbc643e7070d;p=KLGD_FF_plugin.git

Do not start a stopped combinable effect when it gets updated.
---

diff --git a/klgd_ff_plugin.c b/klgd_ff_plugin.c
index d9e2aa5..aac7dbf 100644
--- a/klgd_ff_plugin.c
+++ b/klgd_ff_plugin.c
@@ -657,6 +657,10 @@ static int ffpl_handle_combinable_effects(struct klgd_plugin_private *priv, stru
 			eff->state = FFPL_STARTED;
 		case FFPL_TO_UPDATE:
 			eff->active = eff->latest;
+			if (eff->state != FFPL_STARTED) {
+				printk(KERN_NOTICE "KLGDFF: Updating a stopped combinable effect\n");
+				break;
+			}
 			active_effects++;
 			needs_update = true;
 			printk(KERN_NOTICE "KLGDFF: %s combinable effect, total active effects %lu\n", eff->change == FFPL_TO_START ? "Started" : "Altered", active_effects);
@@ -853,7 +857,7 @@ static void ffpl_advance_trigger(struct ffpl_effect *eff, const unsigned long no
 		eff->trigger = FFPL_TRIG_NONE;
 		break;
 	case FFPL_TRIG_UPDATE:
-		if (ffpl_needs_recalculation(&eff->active, eff->start_at, eff->stop_at, now))
+		if (ffpl_needs_recalculation(&eff->active, eff->start_at, eff->stop_at, now) && eff->state == FFPL_STARTED)
 			eff->trigger = FFPL_TRIG_RECALC;
 		else
 			eff->trigger = FFPL_TRIG_NONE;