Skip to content

Commit cf3e3d9

Browse files
committed
Stability improvements
1 parent cc0e557 commit cf3e3d9

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

facebook/src/facebook_android.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ dmExtension::Result Platform_InitializeFacebook(dmExtension::Params* params)
834834

835835
dmExtension::Result Platform_UpdateFacebook(dmExtension::Params* params)
836836
{
837-
if( !g_Facebook.m_FBApp )
837+
if( !g_Facebook.m_FBApp || g_Facebook.m_CmdQueue.Empty() )
838838
{
839839
return dmExtension::RESULT_OK;
840840
}
@@ -875,8 +875,8 @@ dmExtension::Result Platform_UpdateFacebook(dmExtension::Params* params)
875875
cmd.m_Error = 0x0;
876876
}
877877

878-
g_Facebook.m_CmdQueue.EraseSwap(i--);
879878
}
879+
g_Facebook.m_CmdQueue.SetSize(0);
880880
}
881881
return dmExtension::RESULT_OK;
882882
}

facebook/src/facebook_ios.mm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ static void RunStateCallback(lua_State*L, dmFacebook::State status, NSError* err
313313

314314
int ret = lua_pcall(L, 3, 0, 0);
315315
if (ret != 0) {
316-
dmLogError("Error running facebook callback");
316+
dmLogError("Error running facebook callback: %s", lua_tostring(L, -1));
317+
lua_pop(L, 1);
317318
}
318319
assert(top == lua_gettop(L));
319320
dmScript::Unref(L, LUA_REGISTRYINDEX, g_Facebook.m_Callback);
@@ -381,7 +382,8 @@ static void RunDialogResultCallback(lua_State*L, NSDictionary* result, NSError*
381382

382383
int ret = lua_pcall(L, 3, 0, 0);
383384
if (ret != 0) {
384-
dmLogError("Error running facebook callback");
385+
dmLogError("Error running facebook callback: %s", lua_tostring(L, -1));
386+
lua_pop(L, 1);
385387
}
386388
assert(top == lua_gettop(L));
387389
dmScript::Unref(L, LUA_REGISTRYINDEX, g_Facebook.m_Callback);

game.project

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
dependencies = https://github.com/andsve/dirtylarry/archive/master.zip
2+
dependencies = https://github.com/andsve/dirtylarry/archive/master.zip,https://github.com/defold/extension-gps/archive/master.zip
33
title = extension-facebook
44

55
[bootstrap]
@@ -21,3 +21,4 @@ package = com.defoldextension.facebook
2121

2222
[library]
2323
include_dirs = facebook
24+

0 commit comments

Comments
 (0)