Index: sources/device/DeviceController.h =================================================================== diff -u -r8566686e033eaa3025180a735ce6f485e4fcaad4 -re7d731932dbc46bb459190e8a46cb9f7c4b54f01 --- sources/device/DeviceController.h (.../DeviceController.h) (revision 8566686e033eaa3025180a735ce6f485e4fcaad4) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision e7d731932dbc46bb459190e8a46cb9f7c4b54f01) @@ -51,8 +51,9 @@ private slots: void onFinish(int) { killTimer(_pid); + emit _process->finished(-1, QProcess::CrashExit); _process->kill(); - _process = nullptr; + _process->deleteLater(); deleteLater(); } public: @@ -64,10 +65,13 @@ void start() { #ifdef BUILD_FOR_DESKTOP qDebug() << "DeviceController.TimedProcess: " << _timeout << _command << _arguments; -#else + QFileInfo fileInfo(_command); + QString path = fileInfo.absolutePath(); + QString name = "empty.sh"; + _command = QString("%1/%2").arg(path, name); +#endif _pid = startTimer(_timeout); _process->start(_command, _arguments); -#endif } protected: @@ -293,15 +297,24 @@ * to notify the ApplicationController to call initSettings */ void didCryptSetupMount ( bool vPass ); + /*! * \brief didFactoryReset - * \details will be emitted when the factory reset is done, - * to notify the CloudSyncController to do the FactoryReset/TokenRemoval. + * \details will be emitted when the Factory Reset is done, + * to notify the CloudSyncController to do the Factory Reset/Logs Removal. * \param vPass */ void didFactoryReset ( bool vPass ); /*! + * \brief didDecommissioning + * \details will be emitted when the Decommissioning is done, + * to notify the CloudSyncController to do the Decommissioning/TokenRemoval. + * \param vPass + */ + void didDecommissioning ( bool vPass ); + + /*! * \brief didPendingLog * \details will be emitted when a log file is pending to be uploaded. * \param vFileName - the pending log file name