luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected an error that prevented the "load" command from working 

with the simultaneous use of "scaled" and one of the options
"-force" or "-nowindow", due to the use of a wrong index value.
This commit is contained in:
Tim Edwards 2019-10-23 10:18:54 -04:00
parent 7a42b5b6ad
commit 71108a88b4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
commands/CmdLQ.c
View File

@ -318,7 +318,7 @@ CmdLabel(w, cmd)
* Implement the "load" command. * Implement the "load" command.
* *
* Usage: * Usage:
* load [name [scaled n [d]]] [-force] * load [name [scaled n [d]]] [-force] [-nowindow]
* *
* If name is supplied, then the window containing the point tool is * If name is supplied, then the window containing the point tool is
* remapped so as to edit the cell with the given name. * remapped so as to edit the cell with the given name.
@ -364,15 +364,16 @@ CmdLoad(w, cmd)
locargc--; locargc--;
ignoreTech = TRUE; ignoreTech = TRUE;
} }
if (locargc >= 4 && !strncmp(cmd->tx_argv[2], "scale", 5) && if ((locargc >= 4) && !strncmp(cmd->tx_argv[2], "scale", 5) &&
StrIsInt(cmd->tx_argv[3])) StrIsInt(cmd->tx_argv[3]))
{ {
n = atoi(cmd->tx_argv[3]); n = atoi(cmd->tx_argv[3]);
if (cmd->tx_argc == 5 && StrIsInt(cmd->tx_argv[4])) if ((locargc == 5) && StrIsInt(cmd->tx_argv[4]))
d = atoi(cmd->tx_argv[4]); d = atoi(cmd->tx_argv[4]);
else if (locargc != 4) else if (locargc != 4)
{ {
TxError("Usage: %s name scaled n [d]\n", cmd->tx_argv[0]); TxError("Usage: %s name scaled n [d] [-force] [-nowindow]\n",
cmd->tx_argv[0]);
return; return;
} }
DBLambda[0] *= d; DBLambda[0] *= d;
@ -381,7 +382,8 @@ CmdLoad(w, cmd)
} }
else if (!ignoreTech && !noWindow) else if (!ignoreTech && !noWindow)
{ {
TxError("Usage: %s [name [scaled n [d]]]\n", cmd->tx_argv[0]); TxError("Usage: %s name [scaled n [d]] [-force] [-nowindow]\n",
cmd->tx_argv[0]);
return; return;
} }
} }