diff options
| author | June McEnroe <june@causal.agency> | 2020-03-08 23:15:56 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-03-08 23:15:56 -0400 |
| commit | 7e120f00a19c27e0b98e27a2eacacdfce9bd3ca2 (patch) | |
| tree | 868dee59354b1b1f8c80bcd447f253fbb2c4a145 | |
| parent | Prevent entering commands in <debug> if restricted (diff) | |
| download | catgirl-7e120f00a19c27e0b98e27a2eacacdfce9bd3ca2.tar.gz catgirl-7e120f00a19c27e0b98e27a2eacacdfce9bd3ca2.zip | |
Set self.pos before handling the message
This intuitively feels wrong, but isn't. Most importantly, handleError immediately exits, but we still need to "consume" that message, otherwise pounce will keep sending it on reconnect. The same goes for any other handler that might cause an exit, such as a require parameter count failure.
| -rw-r--r-- | handle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/handle.c b/handle.c index 0a1dedb..d0236fd 100644 --- a/handle.c +++ b/handle.c @@ -1018,6 +1018,9 @@ static int compar(const void *cmd, const void *_handler) { void handle(struct Message msg) { if (!msg.cmd) return; + if (msg.tags[TagPos]) { + self.pos = strtoull(msg.tags[TagPos], NULL, 10); + } const struct Handler *handler = bsearch( msg.cmd, Handlers, ARRAY_LEN(Handlers), sizeof(*handler), compar ); @@ -1026,7 +1029,4 @@ void handle(struct Message msg) { } else if (strcmp(msg.cmd, "400") >= 0 && strcmp(msg.cmd, "599") <= 0) { handleErrorGeneric(&msg); } - if (msg.tags[TagPos]) { - self.pos = strtoull(msg.tags[TagPos], NULL, 10); - } } |