mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-15 09:11:48 +00:00
Merge branch 'insert-wait' into 'next'
Do not let previous wait commands affect COM_BufInsertText See merge request STJr/SRB2!1207
This commit is contained in:
commit
fd63b50f44
1 changed files with 6 additions and 0 deletions
|
@ -165,6 +165,8 @@ void COM_BufAddTextEx(const char *ptext, int flags)
|
|||
*/
|
||||
void COM_BufInsertTextEx(const char *ptext, int flags)
|
||||
{
|
||||
const INT32 old_wait = com_wait;
|
||||
|
||||
char *temp = NULL;
|
||||
size_t templen;
|
||||
|
||||
|
@ -176,10 +178,14 @@ void COM_BufInsertTextEx(const char *ptext, int flags)
|
|||
VS_Clear(&com_text);
|
||||
}
|
||||
|
||||
com_wait = 0;
|
||||
|
||||
// add the entire text of the file (or alias)
|
||||
COM_BufAddTextEx(ptext, flags);
|
||||
COM_BufExecute(); // do it right away
|
||||
|
||||
com_wait += old_wait;
|
||||
|
||||
// add the copied off data
|
||||
if (templen)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue