fix deferring of CanPush, and stop deferring StartingPush

Assistant/NetMessager.hs

@@ -61,8 +61,8 @@ runPush v handledeferred a = do
 		<~> handledeferred m
 
 {- While a push is running, matching push messages are put into
- - netMessagesPush, while others go to netMessagesDeferredPush. To avoid
+ - netMessagesPush, while others go to netMessagesDeferredPush.
- - bloating memory, only PushRequest and StartingPush messages are
+ - To avoid bloating memory, only messages that initiate pushes are
  - deferred.
  -
  - When no push is running, returns False.
@@ -82,10 +82,8 @@ queueNetPushMessage m = do
 			writeTChan (netMessagesPush nm) m
 			return True
 		| otherwise = do
-			case m of
+			when (isPushInitiationMessage m) $
-				PushRequest _ -> defer nm
+				defer nm
-				StartingPush _ -> defer nm
-				_ -> noop
 			return True
 	defer nm = do
 		s <- takeTMVar (netMessagesDeferredPush nm)

Assistant/Types/NetMessager.hs

@@ -53,6 +53,11 @@ getClientID (ReceivePackOutput cid _) = Just cid
 getClientID (SendPackOutput cid _) = Just cid
 getClientID (ReceivePackDone cid _) = Just cid
 
+isPushInitiationMessage :: NetMessage -> Bool
+isPushInitiationMessage (CanPush _) = True
+isPushInitiationMessage (PushRequest _) = True
+isPushInitiationMessage _ = False
+
 data NetMessager = NetMessager
 	-- outgoing messages
 	{ netMessages :: TChan (NetMessage)