2 files changed, 23 insertions, 3 deletions

diff --git a/apps/settings.c b/apps/settings.c
index bc6f066e22..e60b1b5f1a 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -394,8 +394,28 @@ bool settings_load_config(const char* file, bool apply)
                     else if (setting->flags & F_ALLOW_ARBITRARY_VALS)
                     {
                         *v = atoi(value);
-                        logf("Val: %s\r\n",value);
+                        logf("Val: %s = %d\r\n", value, *v);
                     }
+                    else if (setting->flags & F_TABLE_SETTING)
+                    {
+                        const struct table_setting *info = setting->table_setting;
+                        temp = atoi(value);
+                        *v = setting->default_val.int_;
+                        if (info->values)
+                        {
+                            for(int i = 0; i < info->count; i++)
+                            {
+                                if (info->values[i] == temp)
+                                {
+                                    *v = temp;
+                                    break;
+                                }
+                            }
+                        }
+                        logf("Val: %s", *v == temp ? "Found":"Error Not Found");
+                        logf("Val: %s = %d\r\n", value, *v);
+                    }
+
                     else
                     {
                         logf("Error: %s: Not Found! [%s]\r\n",
diff --git a/apps/settings_list.c b/apps/settings_list.c
index ae98ae0187..ab02683d94 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1644,8 +1644,8 @@ const struct settings_list settings[] = {
     OFFON_SETTING(F_SOUNDSETTING, dithering_enabled, LANG_DITHERING, false,
                   "dithering enabled", dsp_dither_enable),
     /* surround */
-     TABLE_SETTING(F_TIME_SETTING | F_SOUNDSETTING | F_ALLOW_ARBITRARY_VALS,
-                  surround_enabled, LANG_SURROUND, 0, "surround enabled", off,
+     TABLE_SETTING(F_TIME_SETTING | F_SOUNDSETTING, surround_enabled,
+                  LANG_SURROUND, 0, "surround enabled", off,
                   UNIT_MS, formatter_time_unit_0_is_off,
                   getlang_time_unit_0_is_off,
                   dsp_surround_enable, 6,