[[ Bug 10880 ]] Make sure multiline input delegate deregisters its observer over the view on iOS.

runrevmark · runrevmark · commit 638d8263af34 · 2013-05-22T11:32:18.000+01:00
diff --git a/engine/src/mbliphoneinput.mm b/engine/src/mbliphoneinput.mm
@@ -630,10 +630,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 void MCNativeInputFieldControl::DeleteView(UIView *p_view)
 {
 	[p_view setDelegate: nil];
-	[p_view release];
 	
+	// MW-2013-05-22: [[ Bug 10880 ]] Make sure we release the delegate here as
+	//   it might need to refer to the view to deregister itself.
 	[m_delegate release];
 	m_delegate = nil;
+	
+	[p_view release];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -882,10 +885,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 void MCNativeMultiLineControl::DeleteView(UIView *p_view)
 {
 	[p_view setDelegate: nil];
-	[p_view release];
 	
+	// MW-2013-05-22: [[ Bug 10880 ]] Make sure we release the delegate here as
+	//   it might need to refer to the view to deregister itself.
 	[m_delegate release];
 	m_delegate = nil;
+	
+	[p_view release];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1133,6 +1139,15 @@ - (id)initWithInstance:(MCNativeInputControl *)instance view:(UIView *)view
 	return self;
 }
 
+// MW-2013-05-22: [[ Bug 10880 ]] Make sure we have a 'dealloc' method so observers
+//   can be removed that reference this object.
+- (void)dealloc
+{
+	[m_instance -> GetView() removeObserver: self forKeyPath:@"contentSize"];
+	[super dealloc];
+}
+   
+
 - (void)scrollViewWillBeginDragging: (UIScrollView*)scrollView
 {
 	MCCustomEvent *t_event;
