summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-22 21:46:18 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-22 21:46:18 (GMT)
commit09e751f6f7415dc0281d612284975b4601760a48 (patch)
treee384b4d147aa94730e0d2d8563f1b28c3ffbe802
parent36c6899a433c295bb36a79cbd12c4d92c8fdac7e (diff)
Fix crash due to activeJob pointer not being reset. Make sure all queue icons are disabled during sequence execution
-rw-r--r--kstars/ekos/capture/capture.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
index 48e3709..072df2b 100644
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -378,8 +378,7 @@ void Capture::start()
startB->setToolTip(i18n("Stop Sequence"));
pauseB->setEnabled(true);
- foreach (QAbstractButton *button, queueEditButtonGroup->buttons())
- button->setEnabled(false);
+ setBusy(true);
prepareJob(first_job);
@@ -448,8 +447,8 @@ void Capture::stop(bool abort)
pauseB->setEnabled(false);
}
- foreach (QAbstractButton *button, queueEditButtonGroup->buttons())
- button->setEnabled(true);
+ //foreach (QAbstractButton *button, queueEditButtonGroup->buttons())
+ //button->setEnabled(true);
seqTimer->stop();
@@ -1737,8 +1736,9 @@ void Capture::setBusy(bool enable)
enable ? pi->startAnimation() : pi->stopAnimation();
previewB->setEnabled(!enable);
- //startB->setEnabled(!enable);
- //stopB->setEnabled(enable);
+
+ foreach (QAbstractButton *button, queueEditButtonGroup->buttons())
+ button->setEnabled(!enable);
}
void Capture::prepareJob(SequenceJob *job)
@@ -2523,11 +2523,11 @@ void Capture::resetJobs()
foreach(SequenceJob *job, jobs)
job->resetStatus();
- stop();
-
- // Reste active job pointer
+ // Reset active job pointer
activeJob = NULL;
+ stop();
+
ignoreJobProgress=true;
}