Skip to content
Snippets Groups Projects
Commit de40226d authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Partial fixes

parent 9740b24b
No related branches found
No related tags found
No related merge requests found
......@@ -79,6 +79,8 @@ void FitSessionManager::removeController(SessionItem* jobItem)
throw GUIHelpers::Error("FitActivityManager::removeFitSession() -> Error. "
"Can't find fit session");
if (m_activeController==it.value())
m_activeController = nullptr;
it.value()->deleteLater();
m_item_to_controller.erase(it);
}
......@@ -65,12 +65,8 @@ void FitSessionWidget::setModelTuningWidget(ParameterTuningWidget* tuningWidget)
void FitSessionWidget::setSessionController(FitSessionController* sessionController)
{
if (m_sessionController) {
disconnect(m_sessionController, &FitSessionController::fittingError,
this, &FitSessionWidget::onFittingError);
disconnect(m_controlWidget, &RunFitControlWidget::startFittingPushed,
m_sessionController, &FitSessionController::onStartFittingRequest);
disconnect(m_controlWidget, &RunFitControlWidget::stopFittingPushed,
m_sessionController, &FitSessionController::onStopFittingRequest);
disconnect(m_sessionController, 0, this, 0);
disconnect(m_controlWidget, 0, m_sessionController, 0);
}
m_sessionController = sessionController;
......@@ -78,6 +74,7 @@ void FitSessionWidget::setSessionController(FitSessionController* sessionControl
if (m_sessionController) {
connect(m_sessionController, &FitSessionController::fittingError,
this, &FitSessionWidget::onFittingError);
connect(m_sessionController, &QObject::destroyed, [this] { m_sessionController=nullptr; });
connect(m_controlWidget, &RunFitControlWidget::startFittingPushed,
m_sessionController, &FitSessionController::onStartFittingRequest);
connect(m_controlWidget, &RunFitControlWidget::stopFittingPushed,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment