Merge "Remove un-needed "-netspeed full" and "-netdelay none"."

2 files changed, 14 insertions, 9 deletions

diff --git a/android/main-common.h b/android/main-common.h
index c26b9b9..a74bf52 100644
--- a/android/main-common.h
+++ b/android/main-common.h
@@ -37,6 +37,9 @@ extern SkinKeyset*  android_keyset;
 void parse_keyset(const char*  keyset, AndroidOptions*  opts);
 void write_default_keyset( void );
 
+#define NETWORK_SPEED_DEFAULT  "full"
+#define NETWORK_DELAY_DEFAULT  "none"
+
 extern const char*  skin_network_speed;
 extern const char*  skin_network_delay;
 
diff --git a/android/main.c b/android/main.c
index 03cc2a8..d906f8d 100644
--- a/android/main.c
+++ b/android/main.c
@@ -299,15 +299,17 @@ int main(int argc, char **argv)
     parse_skin_files(opts->skindir, opts->skin, opts, hw,
                      &skinConfig, &skinPath);
 
-    if (!opts->netspeed) {
-        if (skin_network_speed)
-            D("skin network speed: '%s'", skin_network_speed);
-        opts->netspeed = (char*)skin_network_speed;
-    }
-    if (!opts->netdelay) {
-        if (skin_network_delay)
-            D("skin network delay: '%s'", skin_network_delay);
-        opts->netdelay = (char*)skin_network_delay;
+    if (!opts->netspeed && skin_network_speed) {
+        D("skin network speed: '%s'", skin_network_speed);
+        if (strcmp(skin_network_speed, NETWORK_SPEED_DEFAULT) != 0) {
+            opts->netspeed = (char*)skin_network_speed;
+        }
+    }
+    if (!opts->netdelay && skin_network_delay) {
+        D("skin network delay: '%s'", skin_network_delay);
+        if (strcmp(skin_network_delay, NETWORK_DELAY_DEFAULT) != 0) {
+            opts->netdelay = (char*)skin_network_delay;
+        }
     }
 
     if (opts->trace) {