summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2016-09-14 11:26:46 +0800
committerGitHub <noreply@github.com>2016-09-14 11:26:46 +0800
commitf71ceda12b68802de61bd0dedfbcee0ac104128b (patch)
treecff5c063c176794bdd0d1e750bf5403911be4b27
parentbbfc58e46f4fb329c8ff0f72b627c86f07e67324 (diff)
parent7bc48a0ed3fc2d040d4776f3da7a8158e4f497f3 (diff)
downloadworkbench-f71ceda12b68802de61bd0dedfbcee0ac104128b.tar.gz
workbench-f71ceda12b68802de61bd0dedfbcee0ac104128b.tar.bz2
workbench-f71ceda12b68802de61bd0dedfbcee0ac104128b.zip
Merge pull request #29 from oyvindberg/fix_match_error
Fix when we get `Clear` and have waiting messages
-rw-r--r--src/main/scala/workbench/Server.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/workbench/Server.scala b/src/main/scala/workbench/Server.scala
index 353187c..1d6d1ba 100644
--- a/src/main/scala/workbench/Server.scala
+++ b/src/main/scala/workbench/Server.scala
@@ -92,8 +92,8 @@ class Server(url: String, port: Int, bootSnippet: String) extends SimpleRoutingA
respond(a, upickle.json.write(Js.Arr(msg)))
waitingActor = None
- case (Clear, waiting, Nil) =>
- waiting.foreach(respond(_, upickle.json.write(Js.Arr())))
+ case (Clear, waitingOpt, msgs) =>
+ waitingOpt.foreach(respond(_, upickle.json.write(Js.Arr(msgs :_*))))
waitingActor = None
}
})