Skip to content

Commit

Permalink
Merge branch 'master' into check_network
Browse files Browse the repository at this point in the history
  • Loading branch information
xiyoo0812 committed Apr 18, 2024
2 parents 656201b + 24eafb2 commit 61f409c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 0 additions & 2 deletions core/quanta/src/execute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
int main(int argc, const char* argv[])
{
init_quanta(argv[1], argv[2]);
const char* data = call_quanta("get_world_addr");
printf("============================: %s\n", data);
while (true) {
if(run_quanta() != 0) break;
}
Expand Down
3 changes: 3 additions & 0 deletions core/quanta/src/quanta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,9 @@ luakit::lua_table quanta_app::init() {
const char* env_service = get_env("QUANTA_SERVICE");
logger::get_logger()->option(env_log_path, env_service, env_index);
}
#ifdef WIN32
m_lua.run_script("os.setlocale('.UTF8')");
#endif
m_lua.run_script(fmt::format("require '{}'", get_env("QUANTA_SANDBOX")), [&](std::string_view err) {
exception_handler("load sandbox err: {}", err);
});
Expand Down

0 comments on commit 61f409c

Please sign in to comment.