diff --git a/LICENSE b/LICENSE index 687143d09..c5f061948 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2015-2016 URDE Contributors +Copyright (c) 2015-2017 URDE Contributors Original Authors: Jack Andersen and Phillip "Antidote" Stephens Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/gbalink/main.cpp b/gbalink/main.cpp index a4292535f..fd6b42bec 100644 --- a/gbalink/main.cpp +++ b/gbalink/main.cpp @@ -192,7 +192,7 @@ void CGBASupport::Update(float dt) case EPhase::PollJoyBusBoot: u8 percent; - if (m_endpoint->GBAGetProcessStatus(&percent) == jbus::GBA_BUSY) + if (m_endpoint->GBAGetProcessStatus(percent) == jbus::GBA_BUSY) break; if (m_endpoint->GBAGetStatus(&x3c_status) == jbus::GBA_NOT_READY) { diff --git a/hecl b/hecl index 5d4f1c995..c51b6c0cd 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 5d4f1c9952d104b035629e6275243892da0c4d0b +Subproject commit c51b6c0cd96225e38c43c5116a7cce333e369894 diff --git a/jbus b/jbus index a3fe0a3a2..4699542f9 160000 --- a/jbus +++ b/jbus @@ -1 +1 @@ -Subproject commit a3fe0a3a253c340291f8060a6b96ae053a931f6f +Subproject commit 4699542f937ff96a087915e6ff98bf6ceac877c7