diff --git a/kstars/auxiliary/ksutils.cpp b/kstars/auxiliary/ksutils.cpp --- a/kstars/auxiliary/ksutils.cpp +++ b/kstars/auxiliary/ksutils.cpp @@ -1156,7 +1156,7 @@ else if (option == "ASTAP") { #if defined(Q_OS_OSX) - return "/usr/local/bin/aspat"; + return "/Applications/ASTAP.app/Contents/MacOS/astap"; #elif defined(Q_OS_WIN) return "C:\Program Files\astap\astap.exe"; #endif diff --git a/kstars/ekos/guide/guide.h b/kstars/ekos/guide/guide.h --- a/kstars/ekos/guide/guide.h +++ b/kstars/ekos/guide/guide.h @@ -415,6 +415,7 @@ void updateDirectionsFromPHD2(QString mode); + void guideAfterMeridianFlip(); protected slots: void updateTelescopeType(int index); diff --git a/kstars/ekos/guide/guide.cpp b/kstars/ekos/guide/guide.cpp --- a/kstars/ekos/guide/guide.cpp +++ b/kstars/ekos/guide/guide.cpp @@ -154,6 +154,19 @@ driftPlot->replot(); } +void Guide::guideAfterMeridianFlip() +{ + //This will clear the tracking box selection + //The selected guide star is no longer valid due to the flip + guideView->setTrackingBoxEnabled(false); + starCenter = QVector3D(); + + if (Options::resetGuideCalibration()) + clearCalibration(); + guide(); + +} + void Guide::resizeEvent(QResizeEvent *event) { if (event->oldSize().width() != -1) diff --git a/kstars/ekos/manager.cpp b/kstars/ekos/manager.cpp --- a/kstars/ekos/manager.cpp +++ b/kstars/ekos/manager.cpp @@ -3136,12 +3136,7 @@ // Meridian Flip connect(captureProcess.get(), &Ekos::Capture::meridianFlipStarted, guideProcess.get(), &Ekos::Guide::abort, Qt::UniqueConnection); - connect(captureProcess.get(), &Ekos::Capture::meridianFlipCompleted, guideProcess.get(), [&]() - { - if (Options::resetGuideCalibration()) - guideProcess->clearCalibration(); - guideProcess->guide(); - }); + connect(captureProcess.get(), &Ekos::Capture::meridianFlipCompleted, guideProcess.get(), &Ekos::Guide::guideAfterMeridianFlip, Qt::UniqueConnection); } // Guide <---> Mount connections