From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Wed, 26 Mar 2014 04:14:19 +0000 (+0900)
Subject: skin: dereference after null check
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~448^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e2f0cc5fef4f363d6f686652cc44ba6090c9adf;p=sdk%2Femulator%2Fqemu.git

skin: dereference after null check

Change-Id: I6cb2ed95c031ca6dadbd5404e0b31228e772b3f4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
index e48d5679fc..6b49aad89f 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
@@ -151,7 +151,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
 		List<KeyMapType> keyMapList = SkinUtil.getHWKeyMapList(
 				skin.getEmulatorSkinState().getCurrentRotationId());
 
-		if (keyMapList.isEmpty() == false) {
+		if (keyMapList != null && keyMapList.isEmpty() == false) {
 			toggleButton = createToggleButton();
 			toggleButton.setBackground(backgroundColor);
 		}
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
index 9c33bd2698..cbb9ee8e53 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
@@ -252,10 +252,6 @@ public class PopupMenu {
 			}
 
 			if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null) {
-				advancedItem = new MenuItem(menu, SWT.CASCADE);
-				advancedItem.setText(ADVANCED_MENUITEM_NAME);
-				advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED));
-
 				new MenuItem(advancedSubMenu, SWT.SEPARATOR);
 			}
 
@@ -270,8 +266,16 @@ public class PopupMenu {
 			/* Force close menu */
 			forceCloseItem = createForceCloseItem(
 					advancedSubMenu, FORCECLOSE_MENUITEM_NAME);
+
+			if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null
+					|| aboutItem != null || forceCloseItem != null) {
+				advancedItem = new MenuItem(menu, SWT.CASCADE);
+				advancedItem.setText(ADVANCED_MENUITEM_NAME);
+				advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED));
+
+				advancedItem.setMenu(advancedSubMenu);
+			}
 		}
-		advancedItem.setMenu(advancedSubMenu);
 
 		/* Shell menu */
 		if (itemProperties == null ||