Blame celestia-1.4.1-lua51-resume.patch
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
--- celestia-1.4.1/src/celestia/celx.cpp-after-patch1 2006-07-31 09:06:13.000000000 +1000
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
+++ celestia-1.4.1/src/celestia/celx.cpp 2006-07-31 09:05:08.000000000 +1000
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
@@ -530,6 +530,8 @@
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
status = lua_resume(co, narg);
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
if (status == 0)
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
+ return 0;
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
+ else if (status == LUA_YIELD)
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
{
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
int nres = lua_gettop(co);
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
#if 0
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
@@ -541,7 +543,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
}
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
else
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
{
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
- lua_xmove(co, L, 1); // move error message
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
+ lua_xmove(co, L, -1); // move error message
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
return -1; // error flag
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
}
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
}
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
@@ -711,7 +713,8 @@
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
// no other errors, and execution terminates normally. There
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
// should be a better way to figure out whether the script ended
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
// normally . . .
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
- if (strcmp(errorMessage, "cannot resume dead coroutine") != 0)
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
+ if (errorMessage
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
+ && strcmp(errorMessage, "cannot resume dead coroutine") != 0)
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
{
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
cout << "Error: " << errorMessage << '\n';
|
|
![](https://seccdn.libravatar.org/avatar/28cc5df07446c48fb5f92c0d3b3b529a9fcbb6f804c2de09901c7d97a768d932?s=16&d=retro) |
9d29702 |
CelestiaCore* appCore = getAppCore(co);
|