From 326ff5e724eb9d4999192b3d9797363432ce5647 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 9 Jun 2016 17:23:40 +0200 Subject: [PATCH] Provide sane defaults for restart command, and make it optional. CAL-372 #close --- src/modules/finished/FinishedViewStep.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 7579f9b8b..276cede10 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -117,13 +117,20 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) if ( restartNowEnabled ) { if ( configurationMap.contains( "restartNowChecked" ) && - configurationMap.value( "restartNowChecked" ).type() == QVariant::Bool && - configurationMap.contains( "restartNowCommand" ) && - configurationMap.value( "restartNowCommand" ).type() == QVariant::String ) + configurationMap.value( "restartNowChecked" ).type() == QVariant::Bool ) { m_widget->setRestartNowChecked( configurationMap.value( "restartNowChecked" ).toBool() ); + } + + if ( configurationMap.contains( "restartNowCommand" ) && + configurationMap.value( "restartNowCommand" ).type() == QVariant::String ) + { m_widget->setRestartNowCommand( configurationMap.value( "restartNowCommand" ).toString() ); } + else + { + m_widget->setRestartNowCommand( "systemctl reboot"); + } } } }