Improve UUID parsing

The previous approach only worked if the drive name had three letters (usually sda).

include/tui.h

@@ -51,8 +51,6 @@ public:
 
     static enum UserInput readUserInput();
 
-    static void terminateTUI();
-
 private:
     static string sCpuUsage;
     static string sRamUsage;

src/reHDD.cpp

@@ -198,9 +198,8 @@ void reHDD::ThreadUserInput()
             ui->updateTUI(&listDrives, u8SelectedEntry);
             break;
         case TUI::UserInput::Terminate:
-            // cout << "Terminate" << endl;
+            cout << "Terminate" << endl;
             stopShredAllDrives(&listDrives);
-            ui->terminateTUI();
             sleep(5);     // sleep 5 sec
             std::exit(1); // Terminates main, doesn't wait for threads
             break;
@@ -409,10 +408,11 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
 
             while ((getline(&cLine, &len, outputfileBlkid)) != -1) // parse UUID from blkid
             {
-                if (string(cLine).find("PTUUID") != string::npos)
+                size_t ptuuidPos = string(cLine).find("PTUUID");
+                if (ptuuidPos != string::npos)
                 {
                     string sBlkidOut = string(cLine);
-                    sBlkidOut.erase(0, 18);
+                    sBlkidOut.erase(0, ptuuidPos + 8);
                     sBlkidOut.erase(8, sBlkidOut.length());
                     sUUID = sBlkidOut;
                     // cout << "blkid uuid:" << sUUID << endl;

src/tui.cpp

@@ -63,11 +63,6 @@ void TUI::initTUI()
 
 void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 {
-    if (isendwin())
-    {
-        return;
-    }
-
     mxUIrefresh.lock();
     uint16_t u16StdscrX, u16StdscrY;
     getmaxyx(stdscr, u16StdscrY, u16StdscrX);
@@ -255,11 +250,6 @@ 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;