Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes the s shift s bug #636

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,10 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
/* Control A toggle status -1=indefined, 0=all drives delected, 1=all drives selected */
int select_all_toggle_status = -1;

/* This is a flag used to exit this function once drives are selected and S is pressed 0=do not start wipe, 1=start
* wipe */
int startwipe = 0;

/* Get the terminal size */
getmaxyx( stdscr, stdscr_lines, stdscr_cols );

Expand Down Expand Up @@ -1304,6 +1308,10 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
/* Remove the S from keystroke, which allows us to stay within the selection menu loop */
keystroke = 0;
}
else
{
startwipe = 1;
}

break;

Expand Down Expand Up @@ -1402,9 +1410,9 @@ void nwipe_gui_select( int count, nwipe_context_t** c )
while( validkeyhit == 0 && terminate_signal != 1 && stdscr_cols_previous == stdscr_cols
&& stdscr_lines_previous == stdscr_lines );

} while( keystroke != 'S' && terminate_signal != 1 );
} while( startwipe == 0 && terminate_signal != 1 );

if( keystroke == 'S' )
if( startwipe == 1 )
{
/* If user has pressed S to start wipe change status line */
werase( footer_window );
Expand Down
Loading