From 75617fdbeb435ab6329c8a887785d508eaf94d59 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 5 Jun 2008 17:49:48 +0000 Subject: Fixed bug on invalid skin name git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1202 ab2d0c66-481e-0410-8bed-d214d4d58bed --- skins-model.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'skins-model.lua') diff --git a/skins-model.lua b/skins-model.lua index e637023..f4b4de6 100644 --- a/skins-model.lua +++ b/skins-model.lua @@ -6,7 +6,7 @@ local function set_skins(skin) local f, errtxt = io.popen(cmd) local cmdoutput = f:read("*a") f:close() - return cfe({ value=cmdoutput, errtxt=errtxt, label="Set skin result" }) + return cmdoutput, errtxt end local function list_skins() @@ -32,9 +32,12 @@ end update = function (newskin) -- Make sure no one can inject code into the model. local availableskins = list_skins() + local cmdoutput = "Failed to set skin" + local errtxt = "Invalid selection" for i,skin in ipairs(availableskins.value) do if ( skin.value == newskin) then - return set_skins(newskin) + cmdoutput, errtxt = set_skins(newskin) end end + return cfe({ value=cmdoutput, errtxt=errtxt, label="Set skin result" }) end -- cgit v1.2.3