From 724d79a076ded4bfc950bbf6a1a1b73eaadc266f Mon Sep 17 00:00:00 2001 From: Peter Date: Mon, 22 Jun 2015 21:17:15 +0300 Subject: [PATCH] no message --- SSignalKit.xcodeproj/project.pbxproj | 1 + SSignalKit/SSignal+Combine.m | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SSignalKit.xcodeproj/project.pbxproj b/SSignalKit.xcodeproj/project.pbxproj index 9045ecf9b1..1f8ac2e82d 100644 --- a/SSignalKit.xcodeproj/project.pbxproj +++ b/SSignalKit.xcodeproj/project.pbxproj @@ -528,6 +528,7 @@ D0445DCF1A7C2CA500267924 /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0700; LastUpgradeCheck = 0610; ORGANIZATIONNAME = Telegram; TargetAttributes = { diff --git a/SSignalKit/SSignal+Combine.m b/SSignalKit/SSignal+Combine.m index 45660408a6..5c636bba99 100644 --- a/SSignalKit/SSignal+Combine.m +++ b/SSignalKit/SSignal+Combine.m @@ -32,7 +32,10 @@ + (SSignal *)combineSignals:(NSArray *)signals { - return [self combineSignals:signals withInitialStates:nil]; + if (signals.count == 0) + return [SSignal single:@[]]; + else + return [self combineSignals:signals withInitialStates:nil]; } + (SSignal *)combineSignals:(NSArray *)signals withInitialStates:(NSArray *)initialStates