diff options
-rw-r--r-- | android/main-emulator.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/android/main-emulator.c b/android/main-emulator.c index ddcf3065bf..595928c868 100644 --- a/android/main-emulator.c +++ b/android/main-emulator.c @@ -468,6 +468,13 @@ getTargetEmulatorPath(const char* progDir, char* ranchu_result; bool search_for_64bit_emulator = !force_32bit && android_getHostBitness() == 64; +#ifdef _WIN32 + // Using emulator64-arm.exe results in a kernel panic while + // x86/x86_64 emulator executables don't have this issue + if (!strcmp(avdArch, "arm")) { + search_for_64bit_emulator = false; + } +#endif const char* emulatorSuffix; |