Author: tom
Date: Fri Feb  6 09:13:41 2009
New Revision: 4082

URL: http://svn.slimdevices.com?rev=4082&root=Jive&view=rev
Log:
Bug: N/A
Description:
"return to setup" was broken in certain cases, since setupwelcome was freed. 
Now use service call to return to setup so that SetupWelcome is reloaded.

Modified:
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
    
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=4082&root=Jive&r1=4081&r2=4082&view=diff
==============================================================================
--- 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
 (original)
+++ 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
 Fri Feb  6 09:13:41 2009
@@ -95,7 +95,8 @@
                text = self:string("RETURN_TO_SETUP"),
                weight = 2,
                callback = function()
-                       self:step1()
+                       --note: don't refer to self here since the applet wil 
have been freed if this is being called
+                       appletManager:callService("step1")
                end
        }
        jiveMain:addItem(returnToSetup)

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=4082&root=Jive&r1=4081&r2=4082&view=diff
==============================================================================
--- 
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
 (original)
+++ 
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
 Fri Feb  6 09:13:41 2009
@@ -78,7 +78,8 @@
                text = self:string("RETURN_TO_SETUP"),
                weight = 2,
                callback = function()
-                       self:step1()
+                       --note: don't refer to self here since the applet wil 
have been freed if this is being called
+                       appletManager:callService("step1")
                end
                }
        jiveMain:addItem(returnToSetup)

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

Reply via email to