[Jive-Checkins] r2386 - in /7.1/trunk/squeezeplay/src: squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua squeezeplay_jive/test/smoke/CopyingUpdate.bmp squeezeplay_jive/test/smoke/SoftwareUpdate.bmp squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua

[titmuss]

Author: titmuss
Date: Tue Apr 29 05:53:32 2008
New Revision: 2386

URL: http://svn.slimdevices.com?rev=2386&root=Jive&view=rev
Log:
Bug: N/A
Description:
Macro bug fixes.


Modified:
    
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/CopyingUpdate.bmp
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpdate.bmp
    
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua?rev=2386&root=Jive&r1=2385&r2=2386&view=diff
==============================================================================
--- 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
 (original)
+++ 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
 Tue Apr 29 05:53:32 2008
@@ -374,16 +374,16 @@
                return
        end
 
-       local index = menu:getSelectedIndex()
+       local index = menu:getSelectedIndex() or 1
 
        local ok = false
        repeat
-               macroEvent(100, EVENT_KEY_PRESS, KEY_DOWN)
-
                if macroIsMenuItem(pattern) then
                        ok = true
                        break
                end
+
+               macroEvent(100, EVENT_KEY_PRESS, KEY_DOWN)
        until menu:getSelectedIndex() == index
 
        macroDelay(interval)

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/CopyingUpdate.bmp
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/CopyingUpdate.bmp?rev=2386&root=Jive&r1=2385&r2=2386&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpdate.bmp
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpdate.bmp?rev=2386&root=Jive&r1=2385&r2=2386&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua?rev=2386&root=Jive&r1=2385&r2=2386&view=diff
==============================================================================
--- 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua 
(original)
+++ 
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua 
Tue Apr 29 05:53:32 2008
@@ -37,7 +37,7 @@
 
 
 -- Begin update
-if not macroSelectMenuItem(100, "Begin Update") then
+if not macroSelectMenuItem(100, "Begin update") then
        return macroFail("CopyingUpdate")
 end
 macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins