X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/c812e773a8195a42a718ce2de0a4e9bca65382aa..d3c8ab5a395adc36ec3095e7effb6f0db195887b:/Entity/Location.php?ds=sidebyside

diff --git a/Entity/Location.php b/Entity/Location.php
index 984e8d8..85283df 100644
--- a/Entity/Location.php
+++ b/Entity/Location.php
@@ -430,7 +430,7 @@ class Location {
 	 */
 	public function addUser(User $user): Location {
 		//Add from owning side
-		$user->addSubscriber($this);
+		$user->addLocation($this);
 
 		$this->users[] = $user;
 
@@ -444,8 +444,12 @@ class Location {
 	 * @return bool
 	 */
 	public function removeUser(User $user): bool {
+		if (!$this->locations->contains($user)) {
+			return true;
+		}
+
 		//Remove from owning side
-		$user->removeSubscriber($this);
+		$user->removeLocation($this);
 
 		return $this->users->removeElement($user);
 	}
@@ -464,7 +468,7 @@ class Location {
 	 */
 	public function preUpdate(PreUpdateEventArgs $eventArgs) {
 		//Check that we have a location instance
-		if (($location = $eventArgs->getEntity()) instanceof Location) {
+		if (($location = $eventArgs->getObject()) instanceof Location) {
 			//Set updated value
 			$location->setUpdated(new \DateTime('now'));
 		}