From patchwork Fri May 27 17:22:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Raymond X-Patchwork-Id: 97723 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B82D8B6FA0 for ; Sat, 28 May 2011 03:25:32 +1000 (EST) Received: from localhost ([::1]:45545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QQ0mv-0000iX-IG for incoming@patchwork.ozlabs.org; Fri, 27 May 2011 13:25:29 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QQ0ma-0000dk-3c for qemu-devel@nongnu.org; Fri, 27 May 2011 13:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QQ0mZ-0003gA-Fh for qemu-devel@nongnu.org; Fri, 27 May 2011 13:25:08 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:45883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QQ0mZ-0003aF-DT; Fri, 27 May 2011 13:25:07 -0400 Received: by mail-qw0-f45.google.com with SMTP id 8so1166413qwj.4 for ; Fri, 27 May 2011 10:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=SUw6V+5osLCYMU+kS9PJpNRu+8iWFh+6dnsiZ3imDF0=; b=qAFOSxsnhX2xXm8IE0LzO1cRUsolwMxwu1B1ubjlaJDGBFR4jFI+5R1F1KHhsH8UI4 9l0CKYO9TdEKK+70t5APtnEz3Nc6o7on/A+D+gkRGfX8FI+A9/ssi3q7+meifNCcS8nn NSfIYTXXiiMl2h+ikCN35ZBUNysZtlRSpcPzs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=B37MxxE1zNbIU0ERQuQDB4XxwJwFeQgLjiAJ+zaQg4ir+kk6Qbd+1dmHoZDycLeBWR ZPSnCSgTqzN8fkfHX6HYqndcliw/wn9DeXN5sJFEwfZuU83lfbMQrqsi01zO6Z4YhPij JZB3oR5tzZJtUCCj5apl3smF6UF0PgXRGZ4Z0= Received: by 10.224.189.9 with SMTP id dc9mr1818325qab.11.1306517107261; Fri, 27 May 2011 10:25:07 -0700 (PDT) Received: from localhost.localdomain (modemcable055.201-23-96.mc.videotron.ca [96.23.201.55]) by mx.google.com with ESMTPS id e28sm1198569qck.30.2011.05.27.10.25.06 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 May 2011 10:25:06 -0700 (PDT) From: Alexandre Raymond To: qemu-devel@nongnu.org Date: Fri, 27 May 2011 13:22:27 -0400 Message-Id: <1306516951-31105-3-git-send-email-cerbere@gmail.com> X-Mailer: git-send-email 1.7.5 In-Reply-To: <1306516951-31105-1-git-send-email-cerbere@gmail.com> References: <1306516951-31105-1-git-send-email-cerbere@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.45 Cc: qemu-trivial@nongnu.org, Alexandre Raymond Subject: [Qemu-devel] [PATCH 2/6] Cocoa: avoid displaying window when command-line contains '-h' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There was already a check in place to avoid displaying a window in certain modes such as vnc, nographic or curses. Add a check for '-h' to avoid displaying a window for a split- second before showing the usage information. Signed-off-by: Alexandre Raymond --- ui/cocoa.m | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 20f91bc..7fb8d96 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -865,7 +865,8 @@ int main (int argc, const char * argv[]) { /* In case we don't need to display a window, let's not do that */ for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-vnc") || + if (!strcmp(argv[i], "-h") || + !strcmp(argv[i], "-vnc") || !strcmp(argv[i], "-nographic") || !strcmp(argv[i], "-curses")) { return qemu_main(gArgc, gArgv);