summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpiyo <piyo@users.noreply.github.com>2015-09-23 15:36:46 +0900
committerpiyo <piyo@users.noreply.github.com>2015-09-23 15:44:32 +0900
commitcf9145a7830ee179d18e413ff8918296eeb0b788 (patch)
tree95667ea00cecabdc4d3235041139bcb633b56330
parentbfff5762e0df868d13f835a417085cd871bbed8a (diff)
Confirm quit action during scan only when --confirm-quit
-rw-r--r--src/dir_common.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dir_common.c b/src/dir_common.c
index 46ebb75..a670069 100644
--- a/src/dir_common.c
+++ b/src/dir_common.c
@@ -211,7 +211,7 @@ void dir_draw() {
int dir_key(int ch) {
if(dir_fatalerr)
return 1;
- if(confirm_quit_while_scanning_stage_1_passed) {
+ if(confirm_quit && confirm_quit_while_scanning_stage_1_passed) {
if (ch == 'y'|| ch == 'Y') {
return 1;
} else {
@@ -219,8 +219,11 @@ int dir_key(int ch) {
return 0;
}
} else if(ch == 'q') {
- confirm_quit_while_scanning_stage_1_passed = 1;
- return 0;
+ if(confirm_quit) {
+ confirm_quit_while_scanning_stage_1_passed = 1;
+ return 0;
+ } else
+ return 1;
}
return 0;
}