diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /includes/LuaTask.h | |
parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'includes/LuaTask.h')
-rw-r--r-- | includes/LuaTask.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/LuaTask.h b/includes/LuaTask.h index 0d763de..37d64fa 100644 --- a/includes/LuaTask.h +++ b/includes/LuaTask.h @@ -12,13 +12,14 @@ class LuaMainTask; class LuaExecCell { public: LuaExecCell(); + virtual ~LuaExecCell() { } void detach() { m_detached = true; } void exec(LuaMainTask * mainTask); protected: virtual void run(Lua &) = 0; private: Events::Async m_event; - bool m_detached; + bool m_detached = false; friend class LuaTask; }; |