Merge pull request #493 from MatkovIvan/fix/deadlock

Fix deadlock
bitstadium · Dec 13, 2017 · 017f55f · 017f55f
2 parents c97cb5e + 23af55b
commit 017f55f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Classes/BITChannel.m b/Classes/BITChannel.m
@@ -293,14 +293,16 @@ - (void)enqueueTelemetryItem:(BITTelemetryData *)item completionHandler:(nullabl
       return;
     }
 
+    // Should be outside of @synchronized block!
+    BOOL applicationIsInBackground = ([BITHockeyHelper applicationState] == BITApplicationStateBackground);
+
     // Enqueue item.
     @synchronized(self) {
       NSDictionary *dict = [strongSelf dictionaryForTelemetryData:item];
       [strongSelf appendDictionaryToEventBuffer:dict];
+
       // If the app is running in the background.
-      BOOL applicationIsInBackground = ([BITHockeyHelper applicationState] == BITApplicationStateBackground);
-      if (strongSelf.dataItemCount >= strongSelf.maxBatchSize ||
-         (applicationIsInBackground)) {
+      if (strongSelf.dataItemCount >= strongSelf.maxBatchSize || applicationIsInBackground) {
 
         // Case 2: Max batch count has been reached or the app is running in the background, so write queue to disk and delete all items.
         [strongSelf persistDataItemQueue:&BITTelemetryEventBuffer];