From 5d48b126e9142f26093843111c2df9714d9ee3a8 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 16 Feb 2017 09:26:33 -0500
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20ignore=20WebRTC=20setting=20cha?=
 =?UTF-8?q?nges=20if=20user=20dismisses=20settings=20before=20success.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

// FREEBIE
---
 .../view controllers/AdvancedSettingsTableViewController.m | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Signal/src/view controllers/AdvancedSettingsTableViewController.m b/Signal/src/view controllers/AdvancedSettingsTableViewController.m
index 5df4dce71..6f8f0fa5f 100644
--- a/Signal/src/view controllers/AdvancedSettingsTableViewController.m	
+++ b/Signal/src/view controllers/AdvancedSettingsTableViewController.m	
@@ -218,12 +218,10 @@ typedef NS_ENUM(NSInteger, AdvancedSettingsTableViewControllerSection) {
     [[TSNetworkManager sharedManager] makeRequest:request
                                           success:^(NSURLSessionDataTask *task, id responseObject) {
                                               
-                                              AdvancedSettingsTableViewController *strongSelf = weakSelf;
                                               // Use the request id to ignore obsolete requests, e.g. if the
                                               // user repeatedly changes the setting faster than the requests
                                               // can complete.
-                                              if (!strongSelf ||
-                                                  enableWebRTCRequestCounter != enableWebRTCRequestId) {
+                                              if (enableWebRTCRequestCounter != enableWebRTCRequestId) {
                                                   return;
                                               }
                                               
@@ -231,7 +229,8 @@ typedef NS_ENUM(NSInteger, AdvancedSettingsTableViewControllerSection) {
                                               // otherwise local and service state will fall out of sync
                                               // with every network failure.
                                               [Environment.preferences setIsWebRTCEnabled:isWebRTCEnabled];
-                                              [strongSelf.tableView reloadData];
+                                              
+                                              [weakSelf.tableView reloadData];
                                           }
                                           failure:^(NSURLSessionDataTask *task, NSError *error) {
                                               DDLogError(@"Updating attributes failed with error: %@", error.description);