From 18884233322fd43d141100ad865efce7669148f9 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 2 Aug 2018 22:03:10 +0200 Subject: [PATCH 1/4] Added a warning when a second instance is being launched with a backend flag --- qutebrowser/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 3cce2e85e..92894dd77 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -129,6 +129,8 @@ def run(args): sys.exit(usertypes.Exit.err_ipc) if server is None: + if args.backend is not None: + log.init.warning("Changing the backend will not work, the backend from the previous instance will be used!") sys.exit(usertypes.Exit.ok) else: server.got_args.connect(lambda args, target_arg, cwd: From 068ac0df822ef3ddec73c7436191f9fa59f108c7 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 4 Aug 2018 01:06:38 +0200 Subject: [PATCH 2/4] Make the line shorter and span over 2 lines --- qutebrowser/app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 92894dd77..2f96c2269 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -130,7 +130,8 @@ def run(args): if server is None: if args.backend is not None: - log.init.warning("Changing the backend will not work, the backend from the previous instance will be used!") + log.init.warning("Backend from the running" + "instance will be used") sys.exit(usertypes.Exit.ok) else: server.got_args.connect(lambda args, target_arg, cwd: From 56caae9c47969a84c4b565fe3616b2f41d6ef794 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 4 Aug 2018 01:09:15 +0200 Subject: [PATCH 3/4] Fixed the lack of whitespace between words --- qutebrowser/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 2f96c2269..89c7429ce 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -131,7 +131,7 @@ def run(args): if server is None: if args.backend is not None: log.init.warning("Backend from the running" - "instance will be used") + " instance will be used") sys.exit(usertypes.Exit.ok) else: server.got_args.connect(lambda args, target_arg, cwd: From c692649ad1b9a51f78a9760b680917346c33c4ca Mon Sep 17 00:00:00 2001 From: David Date: Sat, 4 Aug 2018 01:12:39 +0200 Subject: [PATCH 4/4] Improved the style of the message --- qutebrowser/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 89c7429ce..a334d8100 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -130,8 +130,8 @@ def run(args): if server is None: if args.backend is not None: - log.init.warning("Backend from the running" - " instance will be used") + log.init.warning( + "Backend from the running instance will be used") sys.exit(usertypes.Exit.ok) else: server.got_args.connect(lambda args, target_arg, cwd: