Skip to content

Commit

Permalink
Fix build error
Browse files Browse the repository at this point in the history
  • Loading branch information
Drewol committed Apr 3, 2019
1 parent 9bb1d18 commit 4dd1887
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions GUI/include/GUI/nanovg_lua.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct ImageAnimation
float Timer;
bool LoadComplete;
Vector<Graphics::Image> Frames;
Thread* Thread;
Thread* JobThread;
lua_State* State;
};

Expand Down Expand Up @@ -149,7 +149,7 @@ static int LoadAnimation(lua_State* L, const char* path, float frametime, int lo
ia->SecondsPerFrame = frametime;
ia->LoadComplete = false;
ia->State = L;
ia->Thread = new Thread(AnimationLoader, files, ia);
ia->JobThread = new Thread(AnimationLoader, files, ia);
g_guiState.animations[key] = ia;

return key;
Expand Down Expand Up @@ -885,8 +885,8 @@ static int DisposeGUI(lua_State* state)
if (anim.second->State != state)
continue;

if(anim.second->Thread && anim.second->Thread->joinable())
anim.second->Thread->join();
if(anim.second->JobThread && anim.second->JobThread->joinable())
anim.second->JobThread->join();
anim.second->Frames.clear();
nvgDeleteImage(g_guiState.vg, anim.first);
}
Expand Down

0 comments on commit 4dd1887

Please sign in to comment.