From f0114263a270238c7ae352c0bb84193a9918df76 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Wed, 10 Dec 2014 11:48:49 +0100
Subject: [PATCH] Fix crash while placing a call in iPad

---
 .../LinphoneUI/Base.lproj/UICallBar~ipad.xib  | 20 ++++++++++++++++---
 Classes/LinphoneUI/UICallBar.m                | 10 +++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib b/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib
index 62f76c9a1..ceb7256d2 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UICallBar">
@@ -14,6 +14,7 @@
                 <outlet property="fourButton" destination="22" id="68"/>
                 <outlet property="hangupButton" destination="11" id="69"/>
                 <outlet property="landscapeView" destination="2" id="70"/>
+                <outlet property="leftPadding" destination="Htc-7i-IYY" id="zVJ-JC-Di6"/>
                 <outlet property="microButton" destination="16" id="71"/>
                 <outlet property="nineButton" destination="27" id="72"/>
                 <outlet property="oneButton" destination="19" id="73"/>
@@ -24,6 +25,7 @@
                 <outlet property="padView" destination="5" id="78"/>
                 <outlet property="pauseButton" destination="13" id="79"/>
                 <outlet property="portraitView" destination="3" id="80"/>
+                <outlet property="rightPadding" destination="aXO-Ng-LZe" id="f1h-to-gx6"/>
                 <outlet property="sevenButton" destination="25" id="81"/>
                 <outlet property="sharpButton" destination="30" id="82"/>
                 <outlet property="sixButton" destination="24" id="83"/>
@@ -347,6 +349,12 @@
                             <state key="selected" image="dialer_alt_back_default_landscape.png"/>
                             <state key="highlighted" image="dialer_alt_over_landscape.png"/>
                         </button>
+                        <imageView hidden="YES" userInteractionEnabled="NO" tag="61" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="xvD-yI-e1g" userLabel="leftPadding">
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        </imageView>
+                        <imageView hidden="YES" userInteractionEnabled="NO" tag="62" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="8M5-a6-pwT" userLabel="rightPadding">
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
@@ -693,6 +701,12 @@
                                 <action selector="onPadClick:" destination="-1" eventType="touchUpInside" id="92"/>
                             </connections>
                         </button>
+                        <imageView userInteractionEnabled="NO" tag="61" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Htc-7i-IYY" userLabel="leftPadding">
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        </imageView>
+                        <imageView userInteractionEnabled="NO" tag="62" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="aXO-Ng-LZe" userLabel="rightPadding">
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m
index 69ec007cd..8847b39cf 100644
--- a/Classes/LinphoneUI/UICallBar.m
+++ b/Classes/LinphoneUI/UICallBar.m
@@ -573,9 +573,12 @@
     [attributes setObject:[NSValue valueWithCGRect:view.bounds] forKey:@"bounds"];
     if([view isKindOfClass:[UIButton class]]) {
         UIButton *button = (UIButton *)view;    
-        [LinphoneUtils buttonMultiViewAddAttributes:attributes button:button];
-    } else if (view.tag ==self.leftPadding.tag || view.tag == self.rightPadding.tag){
-        [attributes setObject:[(UIImageView*)view image] forKey:@"image"];
+		[LinphoneUtils buttonMultiViewAddAttributes:attributes button:button];
+	} else if (view.tag ==self.leftPadding.tag || view.tag == self.rightPadding.tag){
+		UIImage* image = [(UIImageView*)view image];
+		if( image ){
+			[attributes setObject:image forKey:@"image"];
+		}
     }
     [attributes setObject:[NSNumber numberWithInteger:view.autoresizingMask] forKey:@"autoresizingMask"];
 
@@ -589,6 +592,7 @@
         UIButton *button = (UIButton *)view;
         [LinphoneUtils buttonMultiViewApplyAttributes:attributes button:button];
     } else if (view.tag ==self.leftPadding.tag || view.tag == self.rightPadding.tag){
+
         [(UIImageView*)view setImage:[attributes objectForKey:@"image"]];
     }
     view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue];