Fix refuel PFH not exiting on nozzle disconnect #3018
Conversation
|
👍 look good from my side |
| @@ -29,6 +29,10 @@ _maxFuel = getNumber (configFile >> "CfgVehicles" >> (typeOf _target) >> QGVAR(f | |||
| params ["_args", "_pfID"]; | |||
| _args params ["_source", "_sink", "_unit", "_nozzle", "_rate", "_startFuel", "_maxFuel", "_connectFromPoint", "_connectToPoint"]; | |||
|
|
|||
| if (_nozzle getVariable [QGVAR(isConnected), false]) exitWith { | |||
There was a problem hiding this comment.
Nozzle gets deleted by fnc_returnNozzle. So I'd rather check if _source is still connected.
There was a problem hiding this comment.
I don't think it's necessary, this PFH only starts when you attach the nozzle to some vehicle, and with this line it will remove the PFH when you disconnect it from the vehicle. That is before returning the nozzle, PFH will not exist when returning it anymore.
There was a problem hiding this comment.
Doesn't this line need a ! ? If the nozzle is deleted the getVariable will always default to false.
There was a problem hiding this comment.
Sorry, your code doesn't reflect what you are saying. This PFH has to run while the _nozzle is connected.
QGVAR(isConnected) is set to true for _nozzle in fnc_connectNozzleAction which is calling fnc_refuel. So you would add the PFH and remove it next time it executes.
So either negate your condition,
or query QGVAR(sink) on _nozzle which is also set here but gets cleared on disconnecting
There was a problem hiding this comment.
Ah yes, that is my bad, forgot a !, fixing.
Fix refuel PFH not exiting on nozzle disconnect
Fixes #3009