From 4771db72765312b62a713bf990fb6e7125fe9020 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Wed, 18 Dec 2013 13:53:17 +0000
Subject: [PATCH] [Change] Abort hyperspaceing if autonav is aborted during
sequence.
---
src/player.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/player.c b/src/player.c
index 87b87c1..27bbef9 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1491,6 +1491,11 @@ void player_abortAutonav(void) {
if(player_isFlag(PLAYER_AUTONAV)) {
player_message("Autonav aborted!");
player_rmFlag(PLAYER_AUTONAV);
+ if(pilot_isFlag(player, PILOT_HYP_PREP)) {
+ pilot_hyperspaceAbort(player);
+ player_message("Aborting hyperspace sequence.");
+ return;
+ }
}
}