From 8eb90738dec012da2b05345cbfcf410dff01f48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= <felix@passcod.name>
Date: Sun, 27 Jan 2019 15:51:49 +1300
Subject: [PATCH] [run] Move "once" logic to be entirely within handler

---
 src/run.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/run.rs b/src/run.rs
index 439ebff..5207f23 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -114,7 +114,7 @@ where
     }
 
     // Call handler initially, if necessary
-    if args.run_initially && !args.once {
+    if args.run_initially {
         if !handler.on_manual()? {
             return Ok(());
         }
@@ -182,6 +182,10 @@ impl Handler for ExecHandler {
 
     // Only returns Err() on lock poisoning.
     fn on_manual(&mut self) -> Result<bool> {
+        if self.args.once {
+            return Ok(true);
+        }
+
         let cls = self.args.clear_screen;
         self.args.clear_screen = false;
         self.spawn(&[])?;