Avoid accidental program exits (#28)

rikhuijzer · Mar 10, 2023 · 89f83e5 · 89f83e5 · ctrlcctrlv · Aug 21, 2023
1 parent 9aea2e7
commit 89f83e5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/ata/Cargo.toml b/ata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ata"
-version = "2.0.0"
+version = "2.0.1"
 edition = "2021"
 authors = ["Rik Huijzer <t.h.huijzer@rug.nl>", "Fredrick R. Brennan <copypaste@kittens.ph>"]
 license = "MIT"

diff --git a/ata/src/main.rs b/ata/src/main.rs
@@ -62,6 +62,8 @@ impl ConditionalEventHandler for ClearEventHandler {
     }
 }
 
+static HAD_FIRST_INTERRUPT: AtomicBool = AtomicBool::new(false);
+
 fn main() -> prompt::TokioResult<()> {
     let args: Vec<String> = env::args().collect();
     let flags: Flags = Flags::parse();
@@ -174,12 +176,22 @@ fn main() -> prompt::TokioResult<()> {
                 }
                 rl.add_history_entry(line.as_str());
                 tx.send(line).unwrap();
+                HAD_FIRST_INTERRUPT.store(false, Ordering::Relaxed);
             }
             Err(ReadlineError::Interrupted) => {
                 if is_running_clone.load(Ordering::SeqCst) {
                     abort.store(true, Ordering::SeqCst);
                 } else {
-                    break;
+                    if !HAD_FIRST_INTERRUPT.load(Ordering::Relaxed) {
+                        HAD_FIRST_INTERRUPT.store(true, Ordering::Relaxed);
+                        println!("\nPress Ctrl-C again to exit.");
+                        thread::sleep(Duration::from_millis(100));
+                        println!();
+                        prompt::print_prompt();
+                        continue;
+                    } else {
+                        break;
+                    }
                 }
             }
             Err(ReadlineError::Eof) => break,