From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Mon, 23 Feb 2015 02:44:00 +0000 (+0900)
Subject: menu: enable Always on Top menu
X-Git-Tag: TizenStudio_2.0_p3.0~340
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=301f017a842c4d299467d5bac365bec669dc42b1;p=sdk%2Femulator%2Fqemu.git

menu: enable Always on Top menu

include "config-host.h"
add null checking

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

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index e7f1bc1..fc85f46 100644
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -227,7 +227,7 @@ void MainWindow::openController(int index, int dockPos)
     }
 
     QAction *action = NULL;
-    if (popupMenu != NULL) {
+    if (popupMenu != NULL && popupMenu->getControllerMapper() != NULL) {
         action = (QAction *)popupMenu->getControllerMapper()->mapping(index);
     }
 
diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index a7a5ec9..4b7b560 100644
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -31,6 +31,7 @@
 #include <QtWidgets>
 
 #include "contextmenu.h"
+#include "emulator_common.h"
 #include "mainwindow.h"
 #include "menu/advancedmenuitem.h"
 #include "menu/scalemenuitem.h"