From: GiWoong Kim Date: Fri, 31 Oct 2014 10:28:27 +0000 (+0900) Subject: emulator: do not run the qemu_main on thread on MacOS X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4ba9495b5c487afc52e844e43792cce29ce4655;p=sdk%2Femulator%2Fqemu.git emulator: do not run the qemu_main on thread on MacOS On MacOS, qemu_main pthread can cause many problem with Qt UI. So, qemu_main should be moved back to main thread like Windows and Ubuntu. Caution) Camera device cannot work correctly on MacOS from now. We need to fix it later. Change-Id: I7a20634dd7bfb17e3b98652d5dcecc99886ae734 Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index ce3b39cecf..21a83041b8 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -413,7 +413,7 @@ static int emulator_main(int argc, char *argv[], char **envp) return 0; } -#ifdef CONFIG_DARWIN +#if defined(CONFIG_DARWIN) && !defined(CONFIG_QT) int g_argc; static void* main_thread(void* args) @@ -448,7 +448,9 @@ int main(int argc, char *argv[], char **envp) #else // WIN32 int main(int argc, char *argv[]) { +#ifndef CONFIG_DARWIN maru_register_exception_handler(); +#endif return emulator_main(argc, argv, NULL); } #endif