aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2015-11-03 06:33:22 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2015-11-03 06:33:22 +0100
commitbb7cf91eec8c52aae0c73ae0fa7e73976de9be48 (patch)
tree31d2d09e3e00e1743ef1b413bf60d4185ede51f6
parent13ad60a139643056b0787a4dde86c7d8ed52d934 (diff)
downloadapplause2-bb7cf91eec8c52aae0c73ae0fa7e73976de9be48.tar.gz
fixed ZipStream for non-stream operands (like numbers)
-rw-r--r--applause.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/applause.lua b/applause.lua
index 6a5289c..5d19ad8 100644
--- a/applause.lua
+++ b/applause.lua
@@ -802,6 +802,7 @@ ZipStream = DeriveClass(Stream, function(self, fnc, ...)
self.streams = {}
for _, v in ipairs{...} do
+ v = tostream(v)
if v.is_zipstream and v.fnc == fnc then
-- Optimization: Avoid redundant
-- ZipStream objects
@@ -809,7 +810,7 @@ ZipStream = DeriveClass(Stream, function(self, fnc, ...)
table.insert(self.streams, s)
end
else
- table.insert(self.streams, tostream(v))
+ table.insert(self.streams, v)
end
end
end)