Author: titmuss
Date: Fri Feb  8 10:05:26 2008
New Revision: 1870

URL: http://svn.slimdevices.com?rev=1870&root=Jive&view=rev
Log:
Bug: 6580
Description:
Minor fixes.


Modified:
    
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
    
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
    branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua

Modified: 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL: 
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=1870&root=Jive&r1=1869&r2=1870&view=diff
==============================================================================
--- 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
 (original)
+++ 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
 Fri Feb  8 10:05:26 2008
@@ -831,7 +831,9 @@
        -- start timer to resume this task every second
        self.suspendPopup:addTimer(1000,
                function()
-                       self.suspendTask:addTask()
+                       if self.suspendTask then
+                               self.suspendTask:addTask()
+                       end
                end)
 
        while true do

Modified: 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
URL: 
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt?rev=1870&root=Jive&r1=1869&r2=1870&view=diff
==============================================================================
--- 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
 (original)
+++ 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/strings.txt
 Fri Feb  8 10:05:26 2008
@@ -212,3 +212,10 @@
        IT      Annullare o confermare la disattivazione del telecomando
        NL      Annuleer of bevestig het uitzetten van je controller
 
+PLEASE_WAIT
+       DE      Verbindung
+       EN      Please wait
+       ES      Conectando
+       FR      Connexion
+       IT      Connessione...
+       NL      Bezig met verbinden

Modified: 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua
URL: 
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua?rev=1870&root=Jive&r1=1869&r2=1870&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua 
(original)
+++ branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/jive/net/Wireless.lua 
Fri Feb  8 10:05:26 2008
@@ -624,7 +624,7 @@
        table.insert(self.responseQueue, task)
        local _, reply, err = Task:yield(false)
 
-       if err then
+       if not reply or err then
                log:warn(err)
                self:close()
 

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to