mirror of
https://github.com/mauiaaron/apple2.git
synced 2024-09-27 09:56:08 +00:00
Merge remote-tracking branch 'origin/droid-1.1.8.1' into aaron_experimental_rebase
Conflicts: Android/app/build.gradle
This commit is contained in:
commit
14a40e055e
@ -949,7 +949,7 @@ static void MB_Update()
|
||||
return;
|
||||
}
|
||||
|
||||
if (!MockingboardVoice->bActive || !g_bMB_Active)
|
||||
if (!MockingboardVoice->bActive)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user