From 62c791f60923e12ef157f6de7018d0f7ada47911 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 18 Sep 2010 16:32:00 +0000
Subject: Prevent from saving a non-existing skin path in user prefs

---
 program/steps/settings/save_prefs.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'program/steps/settings/save_prefs.inc')

diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 3f13c0af4..a8ff87869 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -116,8 +116,9 @@ switch ($CURR_SECTION)
       $OUTPUT->command('reload', 500);
     }
 
-    // switch skin
-    $OUTPUT->set_skin($a_user_prefs['skin']);
+    // switch skin (if valid, otherwise unset the pref and fall back to default)
+    if (!$OUTPUT->set_skin($a_user_prefs['skin']))
+      unset($a_user_prefs['skin']);
 
     // force min size
     if ($a_user_prefs['pagesize'] < 1)
-- 
cgit v1.2.3