diff --git a/include/tui.h b/include/tui.h index b1b3416..9e671e6 100644 --- a/include/tui.h +++ b/include/tui.h @@ -51,6 +51,8 @@ public: static enum UserInput readUserInput(); + static void terminateTUI(); + private: static string sCpuUsage; static string sRamUsage; @@ -80,4 +82,4 @@ private: string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes); static void vTruncateText(string *psText, uint16_t u16MaxLenght); }; -#endif // TUI_H_ \ No newline at end of file +#endif // TUI_H_ diff --git a/src/reHDD.cpp b/src/reHDD.cpp index e4f15ce..026c614 100644 --- a/src/reHDD.cpp +++ b/src/reHDD.cpp @@ -198,9 +198,10 @@ void reHDD::ThreadUserInput() ui->updateTUI(&listDrives, u8SelectedEntry); break; case TUI::UserInput::Terminate: - cout << "Terminate" << endl; + // cout << "Terminate" << endl; stopShredAllDrives(&listDrives); sleep(5); // sleep 5 sec + ui->terminateTUI(); std::exit(1); // Terminates main, doesn't wait for threads break; default: @@ -724,4 +725,4 @@ bool reHDD::getSystemDrive(string &systemDrive) pclose(outputfileHwinfo); return systemDriveFound; -} \ No newline at end of file +} diff --git a/src/tui.cpp b/src/tui.cpp index 9c822bc..da19e64 100644 --- a/src/tui.cpp +++ b/src/tui.cpp @@ -250,6 +250,11 @@ enum TUI::UserInput TUI::readUserInput() return TUI::UserInput::Undefined; } +void TUI::terminateTUI() +{ + endwin(); +} + void TUI::centerTitle(WINDOW *pwin, const char *title) { int x, maxX, stringSize;