diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-05-26 13:42:13 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-26 13:42:13 -0700 |
| commit | 92502bb9f7dfaa55eb898d9c853c7a18aba6d70d (patch) | |
| tree | a790c12d8f338f27dca24c96e3ecae3db9bb5598 | |
| parent | 65365a971a5e508703e737ed8bf7bf97924d4e54 (diff) | |
| parent | 75188e9796d77d9f59ef818b97931973ebc92239 (diff) | |
| download | sdk-92502bb9f7dfaa55eb898d9c853c7a18aba6d70d.zip sdk-92502bb9f7dfaa55eb898d9c853c7a18aba6d70d.tar.gz sdk-92502bb9f7dfaa55eb898d9c853c7a18aba6d70d.tar.bz2 | |
am 8b057ed6: Fix bad qemud crash on emulator startup.
Merge commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e'
* commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e':
Fix bad qemud crash on emulator startup.
| -rw-r--r-- | emulator/qemud/qemud.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/emulator/qemud/qemud.c b/emulator/qemud/qemud.c index 5edf8a6..92b2a2b 100644 --- a/emulator/qemud/qemud.c +++ b/emulator/qemud/qemud.c @@ -849,6 +849,10 @@ fdhandler_close( FDHandler* f ) static void fdhandler_shutdown( FDHandler* f ) { + /* prevent later fdhandler_close() to + * call the receiver's close. + */ + f->receiver->close = NULL; if (f->out_first != NULL && !f->closing) { @@ -856,11 +860,6 @@ fdhandler_shutdown( FDHandler* f ) f->closing = 1; fdhandler_remove(f); fdhandler_prepend(f, &f->list->closing); - - /* prevent later fdhandler_close() to - * call the receiver's close. - */ - f->receiver->close = NULL; return; } |