aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorAdrian Taylor <adrian@macrobug.com>2009-02-16 10:20:49 +0000
committerAdrian Taylor <adrian@macrobug.com>2009-02-16 10:22:52 +0000
commit6ea48cda17efbcaeae48a5c90107a7e97d495fd9 (patch)
treea27d30d920772e104d734e6f9d691644f3bd1137 /android
parent7a5cb2bf2725afddd4ff9ede151063d23b849d94 (diff)
downloadexternal_qemu-6ea48cda17efbcaeae48a5c90107a7e97d495fd9.zip
external_qemu-6ea48cda17efbcaeae48a5c90107a7e97d495fd9.tar.gz
external_qemu-6ea48cda17efbcaeae48a5c90107a7e97d495fd9.tar.bz2
Fixing emulator crash on Win32.
This fixes a crash when starting the emulator on Win32 after it has been built using 'make_windows_sdk.sh' and when the ANDROID_PRODUCT_OUT variable is not defined. The bug is discussed at http://code.google.com/p/android/issues/detail?id=1999 and the fix is proposed by David Turner at http://groups.google.com/group/android-platform/browse_thread/thread/91b12cc73aae98ae This patch just includes the proposed fix. I have confirmed it fixes the problem for me. The same code built as a Linux emulator also continues to work. I have been unable to test on Darwin as I don't have a handy OS X machine.
Diffstat (limited to 'android')
-rw-r--r--android/utils/dirscanner.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/utils/dirscanner.c b/android/utils/dirscanner.c
index 9f44d2d..032cdbc 100644
--- a/android/utils/dirscanner.c
+++ b/android/utils/dirscanner.c
@@ -46,7 +46,7 @@ _dirScannerInit( DirScanner* s )
if (p >= end)
return -1;
- ret = _findfirst(s->root, &s->findData) + 1;
+ ret = _findfirst(s->root, &s->findData);
s->findIndex1 = ret+1;
return ret;