Index: sources/storage/usbwatcher.cpp =================================================================== diff -u -r939d1bae9a394697d46ca913a2dc3442bf8ef82f -r805119c460b4a266d6401c8705f4427e7fbe270f --- sources/storage/usbwatcher.cpp (.../usbwatcher.cpp) (revision 939d1bae9a394697d46ca913a2dc3442bf8ef82f) +++ sources/storage/usbwatcher.cpp (.../usbwatcher.cpp) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) @@ -76,8 +76,11 @@ */ void USBWatcher::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 /*! * \brief USBWatcher::initConnections @@ -115,11 +118,15 @@ */ void USBWatcher::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 USBWatcher::usbSeek @@ -186,6 +193,8 @@ */ void USBWatcher::usbError(const QString &vDevice) { + // coco begin validated: This needs user interaction to plug-in/out the USB device + // has been tested manually QString error; static QString lastError; switch (errno) { @@ -202,6 +211,7 @@ lastError = error; } } +// coco end /*! * \brief USBWatcher::onUSBDriveUmount @@ -222,6 +232,8 @@ */ bool USBWatcher::usbMount(const QString &vDevice) { + // coco begin validated: This needs user interaction to plug-in the USB device + // has been tested manually bool ok; _usbDrive = vDevice.toLatin1().constData(); ok = ::mount(_usbDrive, USB_Mount_Point, USB_File_System, 0, "") == 0; @@ -235,6 +247,7 @@ } return ok; } +// coco end /*! * \brief USBWatcher::usbUmount @@ -245,6 +258,8 @@ */ bool USBWatcher::usbUmount(const QString &vDevice) { + // coco begin validated: This needs user interaction to plug-out the USB device + // has been tested manually bool ok; ok = ::umount(vDevice.toLatin1().constData()) == 0; if (ok) { @@ -257,6 +272,7 @@ } return ok; } +// coco end /*! * \brief USBWatcher::usbRemove @@ -266,9 +282,12 @@ */ void USBWatcher::usbRemove() { + // coco begin validated: This needs user interaction to plug-out the USB device + // has been tested manually usbUmount(USB_Mount_Point); _umounted = false; _removed = true; LOG_EVENT(tr("USB drive removed")); emit didUSBDriveRemove(); } +// coco end