From 4b941591c5968143b43832be7453172f471bcf6a Mon Sep 17 00:00:00 2001 From: Goffi Date: Sat, 5 Mar 2016 18:00:56 +0100 Subject: [PATCH] jp: moved KeyboardInterrupt catch one level higher, so it is also catched if the loop is not started --- frontends/src/jp/base.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontends/src/jp/base.py b/frontends/src/jp/base.py index 08da2335..d6159214 100644 --- a/frontends/src/jp/base.py +++ b/frontends/src/jp/base.py @@ -249,16 +249,16 @@ class Jp(object): def run(self, args=None): self.args = self.parser.parse_args(args) - self.args.func() - if self._need_loop or self._auto_loop: - self._start_loop() + try: + self.args.func() + if self._need_loop or self._auto_loop: + self._start_loop() + except KeyboardInterrupt: + log.info(_("User interruption: good bye")) def _start_loop(self): self.loop = GLib.MainLoop() - try: - self.loop.run() - except KeyboardInterrupt: - log.info(_("User interruption: good bye")) + self.loop.run() def stop_loop(self): try: