Index: sources/storage/logger.cpp =================================================================== diff -u -r8c69137f18382bdc55a5678e6ed44a7683fe4dea -r805119c460b4a266d6401c8705f4427e7fbe270f --- sources/storage/logger.cpp (.../logger.cpp) (revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea) +++ sources/storage/logger.cpp (.../logger.cpp) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) @@ -77,8 +77,11 @@ */ void Logger::quit() { + // coco begin validated: Application termination is not correctly done in coco!!! + // it has been tested and works perfectly fine in normal run. quitThread(); } +// coco end void Logger::onLog(const QString &vContent, LogType vLogType) { @@ -125,11 +128,15 @@ */ void Logger::quitThread() { + // coco begin validated: Application termination is not correctly done in coco!!! + // it has been tested and works perfectly fine in normal run. + if (! _thread) return; // runs in thread moveToThread(qApp->thread()); } +// coco end /*! * \brief Logger::checkLogPath @@ -228,7 +235,8 @@ FileHandler::write(_logFileName, mContent + "\r\n", true); if (vLogType == eLogError) { #ifdef QT_DEBUG - mContent.prepend("\033[1;31m --- @ --- \033[0m"); + //mContent.prepend("\033[1;31m --- @ --- \033[0m"); + mContent.prepend(" @ "); #endif qDebug().noquote() << mContent; } @@ -243,15 +251,21 @@ */ bool Logger::concurrentExport() { + // coco begin validated: This needs user interaction to export to USB device + // has been tested manually QString mSource = Storage::Log_Base_Path_Name_Location; QString mDestination = Storage::USB_Mount_Point; QFuture future = QtConcurrent::run(&FileHandler::copyFolder, mSource, mDestination); _exportWatcher.setFuture(future); future.waitForFinished(); return true; } +// coco end void Logger::onExport() { + // coco begin validated: This needs user interaction to export to USB device + // has been tested manually emit didExport(); } +// coco end