Changeset View
Changeset View
Standalone View
Standalone View
kstars/ekos/capture/capture.cpp
| Show First 20 Lines • Show All 635 Lines • ▼ Show 20 Line(s) | 633 | { | |||
|---|---|---|---|---|---|
| 636 | // Delete preview job | 636 | // Delete preview job | ||
| 637 | delete (activeJob); | 637 | delete (activeJob); | ||
| 638 | activeJob = nullptr; | 638 | activeJob = nullptr; | ||
| 639 | 639 | | |||
| 640 | emit newStatus(targetState); | 640 | emit newStatus(targetState); | ||
| 641 | } | 641 | } | ||
| 642 | } | 642 | } | ||
| 643 | 643 | | |||
| 644 | // Only emit a new status if there is an active job or if capturing is suspended. | ||||
| 645 | // The latter is necessary since suspending clears the active job, but the Capture | ||||
| 646 | // module keeps the control. | ||||
| 647 | if (activeJob != nullptr || m_State == CAPTURE_SUSPENDED) | ||||
TallFurryMan: OK, but why did you move the test? | |||||
| 648 | emit newStatus(targetState); | ||||
| 649 | | ||||
| 644 | calibrationStage = CAL_NONE; | 650 | calibrationStage = CAL_NONE; | ||
| 645 | m_State = targetState; | 651 | m_State = targetState; | ||
| 646 | 652 | | |||
| 647 | if (activeJob != nullptr) | | |||
| 648 | emit newStatus(targetState); | | |||
| 649 | | ||||
| 650 | // Turn off any calibration light, IF they were turned on by Capture module | 653 | // Turn off any calibration light, IF they were turned on by Capture module | ||
| 651 | if (currentDustCap && dustCapLightEnabled) | 654 | if (currentDustCap && dustCapLightEnabled) | ||
| 652 | { | 655 | { | ||
| 653 | dustCapLightEnabled = false; | 656 | dustCapLightEnabled = false; | ||
| 654 | currentDustCap->SetLightEnabled(false); | 657 | currentDustCap->SetLightEnabled(false); | ||
| 655 | } | 658 | } | ||
| 656 | if (currentLightBox && lightBoxLightEnabled) | 659 | if (currentLightBox && lightBoxLightEnabled) | ||
| 657 | { | 660 | { | ||
| ▲ Show 20 Lines • Show All 5897 Lines • Show Last 20 Lines | |||||
OK, but why did you move the test?