[ReactNative] Fix DevMenu crash when launching the app with WebView e…

…xecutor
mvayngrib · May 5, 2015 · 3ab4d32 · 3ab4d32
1 parent 08246b7
commit 3ab4d32
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/React/Base/RCTDevMenu.m b/React/Base/RCTDevMenu.m
@@ -123,11 +123,17 @@ - (void)updateSettings
 {
   _settings = [NSMutableDictionary dictionaryWithDictionary:[_defaults objectForKey:RCTDevMenuSettingsKey]];
 
+  __weak RCTDevMenu *weakSelf = self;
   dispatch_async(dispatch_get_main_queue(), ^{
-    self.shakeToShow = [_settings[@"shakeToShow"] ?: @YES boolValue];
-    self.profilingEnabled = [_settings[@"profilingEnabled"] ?: @NO boolValue];
-    self.liveReloadEnabled = [_settings[@"liveReloadEnabled"] ?: @NO boolValue];
-    self.executorClass = NSClassFromString(_settings[@"executorClass"]);
+    RCTDevMenu *strongSelf = weakSelf;
+    if (!strongSelf) {
+      return;
+    }
+
+    strongSelf.shakeToShow = [strongSelf->_settings[@"shakeToShow"] ?: @YES boolValue];
+    strongSelf.profilingEnabled = [strongSelf->_settings[@"profilingEnabled"] ?: @NO boolValue];
+    strongSelf.liveReloadEnabled = [strongSelf->_settings[@"liveReloadEnabled"] ?: @NO boolValue];
+    strongSelf.executorClass = NSClassFromString(strongSelf->_settings[@"executorClass"]);
   });
 }