From 7ce6986d921eecd330c4838e5ba652a3ab2f2300 Mon Sep 17 00:00:00 2001 From: localhorst Date: Fri, 12 Dec 2025 22:06:45 +0100 Subject: [PATCH] fix DRYRUN shred --- src/reHDD.cpp | 8 ++++---- src/shred.cpp | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/reHDD.cpp b/src/reHDD.cpp index 04c64d1..ea3757f 100644 --- a/src/reHDD.cpp +++ b/src/reHDD.cpp @@ -226,10 +226,10 @@ void reHDD::ThreadShred(Drive *const pDrive) { if (pDrive != nullptr) { - pDrive->setActionStartTimestamp(); // save timestamp at start of shredding - Shred *pShredTask = new Shred(); // create new shred task - pShredTask->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task - delete pShredTask; // delete shred task + pDrive->setActionStartTimestamp(); // save timestamp at start of shredding + Shred *pShredInstance = new Shred(); // create new shred task + pShredInstance->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task + delete pShredInstance; // delete shred task ui->updateTUI(&listDrives, u16SelectedEntry); } } diff --git a/src/shred.cpp b/src/shred.cpp index e152937..b2c6a0a 100644 --- a/src/shred.cpp +++ b/src/shred.cpp @@ -42,10 +42,6 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd) #ifdef DRYRUN for (int i = 0; i <= 100; i++) { - if (drive->state.load() != Drive::TaskState::SHRED_ACTIVE) - { - return 0; - } drive->setTaskPercentage(i + 0.05); write(*ipSignalFd, "A", 1); usleep(20000); @@ -204,9 +200,8 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd) Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial()); } #endif -#endif - cleanup(); +#endif if ((drive->state.load() == Drive::TaskState::SHRED_ACTIVE) || (drive->state.load() == Drive::TaskState::CHECK_SUCCESSFUL) || (drive->state == Drive::TaskState::CHECK_FAILED)) {