diff options
author | David 'Digit' Turner <digit@android.com> | 2011-07-07 10:12:18 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-07-07 10:12:18 -0700 |
commit | e46907e57c3d74a391b993539bf76014b91406ed (patch) | |
tree | 575317a9c8a8606a4c112421cbdaf5905fe0c575 | |
parent | fe35e230f55c201520a3b38b5fb598766d184d0e (diff) | |
parent | ea2837728272b04bd236a74cd1ea547ec6f63c20 (diff) | |
download | external_qemu-e46907e57c3d74a391b993539bf76014b91406ed.zip external_qemu-e46907e57c3d74a391b993539bf76014b91406ed.tar.gz external_qemu-e46907e57c3d74a391b993539bf76014b91406ed.tar.bz2 |
Merge "Fix a small bug in the -sysdir handling."
-rw-r--r-- | android/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c index cd3fd08..f20ea7b 100644 --- a/android/main.c +++ b/android/main.c @@ -549,7 +549,7 @@ int main(int argc, char **argv) } /* If -system <name> is used, use it to find the initial image */ - if (opts->sysdir != NULL) { + if (opts->sysdir != NULL && !path_exists(opts->system)) { initImage = _getFullFilePath(opts->sysdir, opts->system); } else { initImage = ASTRDUP(opts->system); |