| Révision | 09f513c7e8a467ff6498442c20538ddd5feb271f (tree) |
|---|---|
| l'heure | 2017-02-10 11:12:49 |
| Auteur | ryan <> |
| Commiter | ryan <> |
Allow non-emergency stop in fire phase 1 recall mode. This fixes an issue where an elevator wouldn't recall when the mode is activated and the elevator is moving.
src/sbs/elevator.cpp (diff)| @@ -576,7 +576,7 @@ bool Elevator::Stop(bool emergency) | ||
| 576 | 576 | return ReportError("cannot stop while in inspection service mode"); |
| 577 | 577 | |
| 578 | 578 | //exit if in fire service phase 1 recall |
| 579 | - if (FireServicePhase1 == 1 && FireServicePhase2 == 0) | |
| 579 | + if (FireServicePhase1 == 1 && FireServicePhase2 == 0 && emergency == true) | |
| 580 | 580 | return ReportError("cannot stop while in fire service 1 recall mode"); |
| 581 | 581 | |
| 582 | 582 | if (IsMoving == false) |
Fork