[Title] emulator manager : change touch argument at Launch time

[Desc.] maru-touchscreen -> virtio-touchscreen
[Issue] N/A

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 1069943..3e34aa8 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-manager
-Version: 1.3.42
+Version: 1.3.43
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package: emulator-manager

diff --git a/src/org/tizen/emulator/manager/EmulatorManager.java b/src/org/tizen/emulator/manager/EmulatorManager.java
index f5ed9e4..3614b60 100755 (executable)
--- a/src/org/tizen/emulator/manager/EmulatorManager.java
+++ b/src/org/tizen/emulator/manager/EmulatorManager.java
@@ -253,9 +253,8 @@ public class EmulatorManager {
                        instance.dispose();
                }
 
-               } catch (Exception e) {
+               } catch (Throwable e) {
                        e.printStackTrace();
-
                        if (EMLogger.getLogger() != null) {
                                EMLogger.getLogger().log(Level.WARNING, e.getMessage());
                        }

diff --git a/src/org/tizen/emulator/manager/ui/AboutDialog.java b/src/org/tizen/emulator/manager/ui/AboutDialog.java
index 4adf587..9209503 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/AboutDialog.java
+++ b/src/org/tizen/emulator/manager/ui/AboutDialog.java
@@ -39,7 +39,8 @@ public class AboutDialog {
        }
 
        private static void makeDialog() {
-               dialog = new Shell(EmulatorManager.getInstance().getMainDialog().getShell(), SWT.DIALOG_TRIM);
+               dialog = new Shell(EmulatorManager.getInstance().getMainDialog().getShell(),
+                                               SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
                dialog.setText("About Emulator Manager");
                dialog.setSize(width, height);
                dialog.setLayout(getGridLayout(1, false));
@@ -110,7 +111,7 @@ public class AboutDialog {
                        public void widgetSelected(SelectionEvent arg0) {
                                try {
                                        org.eclipse.swt.program.Program.launch(EmulatorVMs.getInstance().getVMsBaseDirectory());
-                               } catch (Exception e) {
+                               } catch (Throwable e) {
                                        return;
                                }
                        }
@@ -128,7 +129,7 @@ public class AboutDialog {
                        public void widgetSelected(SelectionEvent arg0) {
                                try {
                                        org.eclipse.swt.program.Program.launch("https://developer.tizen.org");
-                               } catch (Exception e) {
+                               } catch (Throwable e) {
                                        return;
                                }
                        }

diff --git a/src/org/tizen/emulator/manager/vms/Launcher.java b/src/org/tizen/emulator/manager/vms/Launcher.java
index c453e02..aadba9c 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/Launcher.java
+++ b/src/org/tizen/emulator/manager/vms/Launcher.java
@@ -262,8 +262,8 @@ public class Launcher {
                        cmd.add("-soundhw");
                        cmd.add("all");
                        cmd.add("-usb");
-                       cmd.add("-usbdevice");
-                       cmd.add("maru-touchscreen");
+                       cmd.add("-device");
+                       cmd.add("virtio-touchscreen");
                        cmd.add("-vga");
                        cmd.add("maru");
                        cmd.add("-bios");