From: giwoong.kim <giwoong.kim@samsung.com>
Date: Fri, 31 Aug 2012 03:15:11 +0000 (+0900)
Subject: [Title] fixed popup MenuDectectListener
X-Git-Tag: TizenStudio_2.0_p2.3~1312^2~51
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bb29ce034dfc6d683ea033ef554dc6beb16914e;p=sdk%2Femulator%2Fqemu.git

[Title] fixed popup MenuDectectListener
[Type] bugfix
[Module] Emulator / menu
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index 6924171..d0513c6 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -723,9 +723,11 @@ public class EmulatorSkin {
 		shellMenuDetectListener = new MenuDetectListener() {
 			@Override
 			public void menuDetected(MenuDetectEvent e) {
-				if (EmulatorSkin.this.contextMenu != null && EmulatorSkin.this.isMousePressed == false) {
-					shell.setMenu(EmulatorSkin.this.contextMenu);
-					EmulatorSkin.this.contextMenu.setVisible(true);
+				Menu menu = EmulatorSkin.this.contextMenu;
+
+				if (menu != null && EmulatorSkin.this.isMousePressed == false) {
+					shell.setMenu(menu);
+					menu.setVisible(true);
 					e.doit = false;
 				} else {
 					shell.setMenu(null);
@@ -761,7 +763,7 @@ public class EmulatorSkin {
 		canvasMenuDetectListener = new MenuDetectListener() {
 			@Override
 			public void menuDetected(MenuDetectEvent e) {
-				Menu menu = shell.getMenu();
+				Menu menu = EmulatorSkin.this.contextMenu;
 
 				if (menu != null && EmulatorSkin.this.isDragStartedInLCD == false) {
 					lcdCanvas.setMenu(menu);