diff options
| author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-09 21:49:20 +0000 |
|---|---|---|
| committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-09 21:49:20 +0000 |
| commit | 736d54113b3f4923892fd0060600e619dd29d9db (patch) | |
| tree | d417427d8aafeab5621c0bdfc9f732e60b1749ac /crawl-ref/source/clua.cc | |
| parent | 5e2d8f305c41e9f2eec9b5a66804d1a03370a0b5 (diff) | |
| download | crawl-ref-736d54113b3f4923892fd0060600e619dd29d9db.tar.gz crawl-ref-736d54113b3f4923892fd0060600e619dd29d9db.zip | |
Fix crash on shutdown caused by bad order of static destruction (ugh).
crawl_environment's destructor uses dlua, but dlua was getting destroyed
first. Rather than mess with stupidly complicated singleton patterns,
I've moved the definition of clua and dlua into acr.cc, to just before
crawl_environment. This makes the order of construction/destruction
well-defined and should be a workable long-term solution.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3559 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/clua.cc')
| -rw-r--r-- | crawl-ref/source/clua.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 1f1f7e3a5e..d132023f9d 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -68,8 +68,6 @@ static int clua_guarded_pcall(lua_State *); static int clua_dofile(lua_State *); static int clua_loadfile(lua_State *); -CLua clua(true); - const int CLua::MAX_THROTTLE_SLEEPS; CLua::CLua(bool managed) |