diff options
| author | Xavier Ducrohet <xav@google.com> | 2015-02-11 18:48:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-11 18:48:38 +0000 |
| commit | a4f7c820f4466440540a7c92ca55ed628529f41a (patch) | |
| tree | 0ec5de5c1c49c8cb3db77bf651019a4a85692602 | |
| parent | 6b9dcc778f64ba75e62bd6fd256fbdb47f1cba49 (diff) | |
| parent | c7e7d8a53fe53a14492cbb7ce55789d164a0517e (diff) | |
| download | qemu-studio-1.1-dev.tar.gz | |
Merge "Disable waiting for RenderThread termination on windows" into studio-1.1-devstudio-1.1-dev
| -rw-r--r-- | distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp b/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp index 8c377be3b2..069c5b3285 100644 --- a/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp +++ b/distrib/android-emugl/host/libs/libOpenglRender/RenderServer.cpp @@ -149,8 +149,12 @@ intptr_t RenderServer::main() for (RenderThreadsSet::iterator t = threads.begin(); t != threads.end(); t++) { +#ifndef _WIN32 + // Note: temporarily disable following steps so emulator does not + // freeze on windows when it is shut down, will fix in 1.2 (*t)->forceStop(); (*t)->wait(NULL); +#endif delete (*t); } threads.clear(); |