[Title] if dbi file does not exist, notify user with popup

[Type]
[Module] Emulator / skin
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
index 4dfb005..64a5c49 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
@@ -39,7 +39,10 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
 import org.tizen.emulator.skin.EmulatorSkin.SkinReopenPolicy;
 import org.tizen.emulator.skin.comm.sock.SocketCommunicator;
 import org.tizen.emulator.skin.config.EmulatorConfig;
@@ -110,6 +113,16 @@ public class EmulatorSkinMain {
                        EmulatorUI dbiContents = loadDbi( argSkinPath, lcdWidth, lcdHeight );
                        if ( null == dbiContents ) {
                                logger.severe( "Fail to load dbi file." );
+
+                               Shell temp = new Shell( Display.getDefault());
+                               MessageBox messageBox = new MessageBox( temp, SWT.ICON_ERROR );
+                               messageBox.setText( "Emulator" );
+                               messageBox.setMessage( "Fail to load \"" + DBI_FILE_NAME + "\" file\n" +
+                                               "Check if the file is corrupted or missing from the following path.\n" +
+                                               argSkinPath );
+                               messageBox.open();
+                               temp.dispose();
+
                                System.exit( -1 );
                        }
 

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index b3277ac..19e339c 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -65,7 +65,7 @@ MULTI_DEBUG_CHANNEL( qemu, skin_server );
 #define HEART_BEAT_INTERVAL 1
 #define HEART_BEAT_FAIL_COUNT 5
 #define HEART_BEAT_EXPIRE_COUNT 5
-#define RESTART_CLIENT_MAX_COUNT 3
+#define RESTART_CLIENT_MAX_COUNT 1
 
 #define PORT_RETRY_COUNT 50