diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-10-26 23:30:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-10-26 23:30:15 +0000 |
| commit | f0b9e5befac2aef2c57d68d1441faed693bacea6 (patch) | |
| tree | 6b0f9746afaa3356db58aa3a7ef0cc533bd87d04 /prosody | |
| parent | 493cfc98173579fe924d06b353cf5416471dec1c (diff) | |
| parent | c73ece03d8efcc4b46712ff32b7da610cb21dc4f (diff) | |
| download | prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.tar.gz prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.zip | |
Merge with trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -282,7 +282,7 @@ end function loop() -- Error handler for errors that make it this far local function catch_uncaught_error(err) - if err:match("%d*: interrupted!$") then + if type(err) == "string" and err:match("%d*: interrupted!$") then return "quitting"; end |