From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Sun, 30 Sep 2012 20:16:14 +0000 (+0200)
Subject: Fix broken -ics and -cp options
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=a19dec65d96e033a4703c5503878e0bdfd7bba45

Fix broken -ics and -cp options

The patch to specify engines and ICS by nickame broke the use of the
regular options to do this, because they could also reset them. Now
this is fixed by only setting them (through |= in stead of =).
---

diff --git a/args.h b/args.h
index cb817c3..2d8b7aa 100644
--- a/args.h
+++ b/args.h
@@ -1289,8 +1289,8 @@ InitAppData(char *lpCmdLine)
 
   if(appData.viewer && appData.viewerOptions[0]) ParseArgsFromString(appData.viewerOptions);
   if(appData.tourney && appData.tourneyOptions[0]) ParseArgsFromString(appData.tourneyOptions);
-  chessProgram = GetEngineLine(firstEngineLine, 0) || GetEngineLine(secondEngineLine, 1);
-  appData.icsActive = GetEngineLine(icsNick, 10);
+  chessProgram |= GetEngineLine(firstEngineLine, 0) || GetEngineLine(secondEngineLine, 1);
+  appData.icsActive |= GetEngineLine(icsNick, 10);
 
   /* [HGM] make sure board size is acceptable */
   if(appData.NrFiles > BOARD_FILES ||