From ada3ce91b85f900501d8addfa446b55d4ebf334b Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Thu, 13 Dec 2018 11:50:08 +0100
Subject: [PATCH] Fix: Return SMART_CANCELLED when cancelled

---
 SmartSoft_CD_API/smartTaskTriggerObserver.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/SmartSoft_CD_API/smartTaskTriggerObserver.h b/SmartSoft_CD_API/smartTaskTriggerObserver.h
index 5b8cf8c..b032b0e 100644
--- a/SmartSoft_CD_API/smartTaskTriggerObserver.h
+++ b/SmartSoft_CD_API/smartTaskTriggerObserver.h
@@ -103,6 +103,10 @@ class TaskTriggerObserver {
 			if(signalled == false) {
 				trigger_cond_var.wait(lock);
 			}
+			if(trigger_cancelled)
+			{
+				return SMART_CANCELLED;
+			}
 			signalled = false;
 			return SMART_OK;
 		}
@@ -119,6 +123,10 @@ class TaskTriggerObserver {
 					return SMART_TIMEOUT;
 				}
 			}
+			if(trigger_cancelled)
+			{
+				return SMART_CANCELLED;
+			}
 			signalled = false;
 			return SMART_OK;
 		}