From 21d928396aca871968314093cb4a258c58c7433e Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 27 Sep 2017 15:50:37 -0500
Subject: [PATCH] Re-add #5544 changes

---
 addons/medical_menu/CfgVehicles.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/medical_menu/CfgVehicles.hpp b/addons/medical_menu/CfgVehicles.hpp
index 51df2cf19f..c24a096be3 100644
--- a/addons/medical_menu/CfgVehicles.hpp
+++ b/addons/medical_menu/CfgVehicles.hpp
@@ -92,14 +92,14 @@ class CfgVehicles {
                 };
                 class  ACE_Medical_loadPatient {
                     displayName = ECSTRING(medical,LoadPatient);
-                    condition = "(_target getVariable ['ACE_isUnconscious', false]) && {vehicle _target == _target}";
+                    condition = "(_target getVariable ['ACE_isUnconscious', false]) && {alive _target} && {vehicle _target == _target}";
                     statement = QUOTE([ARR_2(_player, _target)] call EFUNC(medical_treatment,actionLoadUnit));
                     icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
                     exceptions[] = {"isNotDragging", "isNotCarrying"};
                 };
                 class ACE_Medical_UnLoadPatient {
                     displayName = ECSTRING(medical,UnloadPatient);
-                    condition = "(_target getVariable ['ACE_isUnconscious', false]) && {vehicle _target != _target}";
+                    condition = "(_target getVariable ['ACE_isUnconscious', false]) && {vehicle _target != _target} && {vehicle _player == _player}";
                     statement = QUOTE([ARR_2(_player, _target)] call EFUNC(medical_treatment,actionUnloadUnit));
                     icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
                     exceptions[] = {"isNotDragging", "isNotCarrying", "isNotInside"};