=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: cmd: Merge two if blocks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dbdf927e745e4b9af59af037bdc2ff9ef77bbd9c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dbdf927e745e4b9af59af037bdc2ff9ef77bbd9c

Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date:   Tue Dec 20 14:48:24 2011 +0100

cmd: Merge two if blocks.

---

 programs/cmd/wcmdmain.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index d82427a..67a524d 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1161,10 +1161,7 @@ void WCMD_run_program (WCHAR *command, int called) {
       launched = TRUE;
 
       /* Special case BAT and CMD */
-      if (ext && !strcmpiW(ext, batExt)) {
-        WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE);
-        return;
-      } else if (ext && !strcmpiW(ext, cmdExt)) {
+      if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) {
         WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE);
         return;
       } else {