applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 17:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FinishedPage: don't reboot on failure

Browse source 
If installation fails, and you end up on the last page, suppress the
reboot-now checkbox.

FIXES #605
This commit is contained in:
Adriaan de Groot 2017-07-03 11:04:23 -04:00
parent da75035654
commit 72659dc6e1
3 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/finished/FinishedViewStep.cpp
View file

@ -17,8 +17,10 @@
*/
#include "FinishedViewStep.h"
#include "FinishedPage.h"
#include "JobQueue.h"
#include "utils/Logger.h"
#include <QVariantMap>
@ -26,6 +28,11 @@ FinishedViewStep::FinishedViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_widget( new FinishedPage() )
{
cDebug() << "FinishedViewStep()";
connect( Calamares::JobQueue::instance(), &Calamares::JobQueue::failed,
m_widget, &FinishedPage::onInstallationFailed );
emit nextStatusChanged( true );
}
@ -47,6 +54,7 @@ FinishedViewStep::prettyName() const
QWidget*
FinishedViewStep::widget()
{
cDebug() << "FinishedViewStep::widget()";
return m_widget;
}
@ -94,6 +102,7 @@ FinishedViewStep::isAtEnd() const
void
FinishedViewStep::onActivate()
{
cDebug() << "FinishedViewStep::onActivate()";
m_widget->setUpRestart();
}
@ -101,6 +110,7 @@ FinishedViewStep::onActivate()
QList< Calamares::job_ptr >
FinishedViewStep::jobs() const
{
cDebug() << "FinishedViewStep::jobs";
return QList< Calamares::job_ptr >();
}