Author: richard
Date: Wed Mar 4 03:57:08 2009
New Revision: 4686
URL: http://svn.slimdevices.com/jive?rev=4686&view=rev
Log:
r4...@harrypotter (orig r4685): richard | 2009-03-04 11:56:02 +0000
Bug: N/A
Description:
Fix to slimproto.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Mar 4 03:57:08 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4673
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4681
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4685
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=4686&r1=4685&r2=4686&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Wed Mar 4 03:57:08 2009
@@ -542,7 +542,7 @@
-- Sent packet. Returns false is the connection is disconnected and the
-- packet can't be sent, otherwise it returns true.
function send(self, packet)
- if self.state == UNCONNECTED then
+ if self.state ~= CONNECTED then
return false
end
@@ -604,6 +604,7 @@
log:info("connection error: ", reason, ", reconnecting in ", (interval
/ 1000), " seconds")
self:disconnect()
+
self.state = CONNECTING
self.reconnectTimer:restart(interval)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
