diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-03-14 12:46:51 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-03-14 12:46:51 -0700 |
| commit | 873c3cb5688092d2822837511cfb2b330d265801 (patch) | |
| tree | 264e766f1c01cd9dbbfd0f82a9e0e496f4f103fa /android/main.c | |
| parent | 025a347156acb6c22444f7d4d06c0f44da573c5e (diff) | |
| download | external_qemu-873c3cb5688092d2822837511cfb2b330d265801.zip external_qemu-873c3cb5688092d2822837511cfb2b330d265801.tar.gz external_qemu-873c3cb5688092d2822837511cfb2b330d265801.tar.bz2 | |
Fix snapshot autoconfig
This CL should fix external issue 26839, where system gets loaded from a snapshot
even it is explicitly disabled in config.ini.
The reason for that was a bug in autoconfig generator that didn't respect config.ini
settings for snapshot.
Change-Id: I617e9de7f7472f8d5b75d544f81c5b160f81c2f8
Diffstat (limited to 'android/main.c')
| -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 2723834..854356c 100644 --- a/android/main.c +++ b/android/main.c @@ -853,7 +853,7 @@ int main(int argc, char **argv) } else { - if (!opts->snapstorage) { + if (!opts->snapstorage && avdInfo_getSnapshotPresent(avd)) { opts->snapstorage = avdInfo_getSnapStoragePath(avd); if (opts->snapstorage != NULL) { D("autoconfig: -snapstorage %s", opts->snapstorage); |