Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve GUI thread cancellation messaging

Browse Source 
If pthread_join failed, nwipe would report an error
but would also report that the thread had been
cancelled. This has been corrected so that only
the error message is displayed in a fault condition.
This commit is contained in:
PartialVolume
2021-12-08 23:43:01 +00:00
parent 7f547e7ccb
commit 323fc38631
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nwipe.c
View File

@@ -610,9 +610,12 @@ int main( int argc, char** argv )
{
nwipe_log( NWIPE_LOG_WARNING, "main()>pthread_join():Error when waiting for GUI thread to cancel." );
}
if( nwipe_options.verbose )
else
{
nwipe_log( NWIPE_LOG_INFO, "GUI compute_stats thread has been cancelled" );
if( nwipe_options.verbose )
{
nwipe_log( NWIPE_LOG_INFO, "GUI compute_stats thread has been cancelled" );
}
}
}

4
src/version.c
View File

@@ -4,7 +4,7 @@
* used by configure to dynamically assign those values
* to documentation files.
*/
const char* version_string = "0.32.017";
const char* version_string = "0.32.018";
const char* program_name = "nwipe";
const char* author_name = "Martijn van Brummelen";
const char* email_address = "git@brumit.nl";
@@ -14,4 +14,4 @@ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
FOR A PARTICULAR PURPOSE.\n";
const char* banner = "nwipe 0.32.017";
const char* banner = "nwipe 0.32.018";