summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-08-11 22:17:09 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-08-11 22:17:09 (GMT)
commit43b042440b382c73ffc0c634a990040e1f979727 (patch)
tree30a92654974233902cc0f5af40330a5f65793233
parent31a227f70c31a12ce9f70968b1ddcd82b52a07f4 (diff)
Do not abort if guiding stopped while we are in the middle of a meridian flip
-rw-r--r--kstars/ekos/capture.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kstars/ekos/capture.cpp b/kstars/ekos/capture.cpp
index b96e318..1be1e1a 100644
--- a/kstars/ekos/capture.cpp
+++ b/kstars/ekos/capture.cpp
@@ -349,6 +349,7 @@ void Capture::abort()
emit newStatus(Ekos::CAPTURE_ABORTED);
}
+ activeJob->disconnect(this);
activeJob->reset();
}
@@ -1770,8 +1771,8 @@ void Capture::setGuideDither(bool enable)
void Capture::setAutoguiding(bool enable)
{
- // If Autoguiding was started before and now stopped, let's abort.
- if (enable == false && isAutoGuiding && activeJob && activeJob->getStatus() == SequenceJob::JOB_BUSY)
+ // If Autoguiding was started before and now stopped, let's abort (unless we're doing a meridian flip)
+ if (enable == false && isAutoGuiding && meridianFlipStage == MF_NONE && activeJob && activeJob->getStatus() == SequenceJob::JOB_BUSY)
{
appendLogText(i18n("Autoguiding stopped. Aborting..."));
abort();