Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master fix jerrycanrefuel #686

Merged
merged 3 commits into from May 28, 2020
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Altis_Life.Altis/core/items/fn_jerryCanRefuel.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ if (_action) then {
_progress progressSetPosition _cP;
_pgText ctrlSetText format ["%3 (%1%2)...",round(_cP * 100),"%",_title];
if (_cP >= 1) exitWith {};
if (!alive player) exitWith {life_action_inUse = false;};
if (life_interrupted) exitWith {life_interrupted = false; life_action_inUse = false;};
if (!alive player) exitWith {/*life_action_inUse = false;*/};
if (life_interrupted) exitWith {/*life_interrupted = false; life_action_inUse = false;*/};
};

//Kill the UI display and check for various states
Expand All @@ -77,4 +77,4 @@ if (_action) then {
hint localize "STR_NOTF_ActionCancel";
closeDialog 0;
life_action_inUse = false;
};
};