From bdf0418f5c4a59274131bc199da558547be87935 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 20 Apr 2015 23:29:35 +0200 Subject: [PATCH] input_server: Fix handling of received -q argument. BApplication::ArgvReceived() is called in the already running app in case of a silent relaunch. It is therefore enough to just post a quit message. --- src/servers/input/InputServer.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp index bb74f9b9c7..2cef3847d2 100644 --- a/src/servers/input/InputServer.cpp +++ b/src/servers/input/InputServer.cpp @@ -199,15 +199,10 @@ void InputServer::ArgvReceived(int32 argc, char** argv) { CALLED(); - if (2 == argc && (0 == strcmp("-q", argv[1]))) { + + if (argc == 2 && strcmp(argv[1], "-q") == 0) { PRINT(("InputServer::ArgvReceived - Restarting ...\n")); - status_t quit_status = B_OK; - BMessenger msgr = BMessenger(INPUTSERVER_SIGNATURE, -1, &quit_status); - if (B_OK == quit_status) { - msgr.SendMessage(B_QUIT_REQUESTED); - } else { - PRINTERR(("Unable to send Quit message to running InputServer.\n")); - } + PostMessage(B_QUIT_REQUESTED); } }