controller: fixed emulator termination when key window is activated

Change-Id: I3f62dcc7ec5687f5ab7e9320b820e2072ffef86f
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index eb265aa57eae4cb2ed4a858c2d4b804100636dd3..da51172b5ce15d2a493e39e65780b2aa65327279 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -267,6 +267,8 @@ void MainWindow::openController(int index, int dockPos)
         action = (QAction *)popupMenu->getControllerMapper()->mapping(index);
     }
 
+    getUIState()->conState.conFormIndex = index;
+
     /* create */
     if (dockPos == -1) {
         getUIState()->conState.floatingCon =
@@ -287,8 +289,6 @@ void MainWindow::openController(int index, int dockPos)
     }
 
     /* update layout */
-    getUIState()->conState.conFormIndex = index;
-
     resize(uiInfo->getUiSize());
 
     /* arrange */