Merge lp:~phablet-team/dialer-app/fix_prefix_settings_saving into lp:dialer-app/staging

[Gustavo Pichorim Boiko]

Only try to assing previously set values if they are available.

Only try to assing previously set values if they are available.

[Tiago Salem Herrmann (tiagosh)]

Looks good. thanks.

review: Approve

=== modified file 'src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml'
--- src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml	2017-03-22 17:08:12 +0000
+++ src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml	2017-04-05 13:45:43 +0000
@@ -48,11 +48,11 @@
         }
 
         updating = true
-        numberRewriteSwitch.checked = props.numberRewrite
-        countryCodeField.text = props.defaultCountryCode
-        areaCodeField.text = props.defaultAreaCode
-        removeInputField.text = props.removeCharacters
-        prefixInputField.text = props.prefix
+        numberRewriteSwitch.checked = props.numberRewrite ? props.numberRewrite : false
+        countryCodeField.text = props.defaultCountryCode ? props.defaultCountryCode : ""
+        areaCodeField.text = props.defaultAreaCode ? props.defaultAreaCode : ""
+        removeInputField.text = props.removeCharacters ? props.removeCharacters : ""
+        prefixInputField.text = props.prefix ? props.prefix : ""
         updating = false
     }