[graphics] merc2 fix, texture crash bug fix (#1385)

* [graphics] merc2 fix, texture crash bug fix

* still boot if deci2 fails to init
This commit is contained in:
water111
2022-05-30 11:06:11 -04:00
committed by GitHub
parent 750255e5b2
commit dad84ec249
6 changed files with 102 additions and 68 deletions
+4 -3
View File
@@ -86,14 +86,15 @@ void deci2_runner(SystemThreadInterface& iface) {
lg::debug("[DECI2] Waiting for EE to register protos");
server.wait_for_protos_ready();
// then allow the server to accept connections
if (!server.init_server()) {
ASSERT_MSG(false, "[DECI2] Server not initialized even if protocols are ready, aborting");
bool server_ok = server.init_server();
if (!server_ok) {
lg::error("[DECI2] failed to initialize, REPL will not work.\n");
}
lg::debug("[DECI2] Waiting for listener...");
bool saw_listener = false;
while (!iface.get_want_exit()) {
if (server.is_client_connected()) {
if (server_ok && server.is_client_connected()) {
if (!saw_listener) {
lg::debug("[DECI2] Connected!");
}