mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 03:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop the auxiliar ui::Timer when the last WebSocket is GC'd

Browse Source
This commit is contained in:
David Capello 2021-10-19 10:57:25 -03:00
parent b29627c8cb
commit 651fa4a3b6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/script/websocket_class.cpp
View File

@ -33,6 +33,15 @@ namespace {
static std::unique_ptr<ui::Timer> g_timer;
static std::set<ix::WebSocket*> g_connections;
static void close_ws(ix::WebSocket* ws)
{
ws->stop();
g_connections.erase(ws);
if (g_connections.empty())
g_timer.reset();
}
int WebSocket_new(lua_State* L)
{
static std::once_flag f;
@ -108,7 +117,7 @@ int WebSocket_new(lua_State* L)
int WebSocket_gc(lua_State* L)
{
auto ws = get_ptr<ix::WebSocket>(L, 1);
ws->stop();
close_ws(ws);
delete ws;
return 0;
}
@ -182,13 +191,7 @@ int WebSocket_connect(lua_State* L)
int WebSocket_close(lua_State* L)
{
auto ws = get_ptr<ix::WebSocket>(L, 1);
ws->stop();
g_connections.erase(ws);
if (g_connections.empty()) {
g_timer = nullptr;
}
close_ws(ws);
return 0;
}