Fixes #254: Exception on CTRL+C

evilsocket · Aug 11, 2016 · 4f9be71 · 4f9be71
1 parent 564d3bc
commit 4f9be71
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/bin/bettercap b/bin/bettercap
@@ -57,8 +57,15 @@ rescue Exception => e
   BetterCap::Logger.error "Backtrace         :\n\n    #{e.backtrace.join("\n    ")}\n"
 
 ensure
+  # handle double ctrl+c nicely
+  trap("INT") { }
+
   # Make sure all the messages on the logger queue are printed.
-  BetterCap::Logger.wait!
+  begin
+    BetterCap::Logger.wait!
+  rescue; end
 
-  ctx.finalize unless ctx.nil?
+  begin
+    ctx.finalize unless ctx.nil?
+  rescue; end
 end