From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Fri, 20 Nov 2015 09:32:18 +0000 (+0900)
Subject: emul_state: fix build error caused by wrong merge
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e0926b03fc2c9b20541d436772d596480d2ad3b;p=sdk%2Femulator%2Fqemu.git

emul_state: fix build error caused by wrong merge

Change-Id: I1abe2971ddb7e37bb7fbbe6905cd866e212e1ebb
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index 60a169380a..23e883024f 100644
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -851,9 +851,8 @@ int get_display_resolution_height(void)
     return qemu_console_get_height(NULL, initial_resolution_height);
 #else
     if (display_type == DT_MARU_QT_ONSCREEN ||
-            display_type == DT_MARU_QT_OFFSCREEN,
-                initial_resolution_height) {
-        return qemu_console_get_height(NULL, -1);
+            display_type == DT_MARU_QT_OFFSCREEN) {
+        return qemu_console_get_height(NULL, initial_resolution_height);
     }
     if (initial_resolution_height == -1) {
         set_resolution_legacy();