# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1284052197 -3600
# Node ID b0a26d6936b254e56b6c71a1db34281d4d1fbea2
# Parent  fe4f904300fcf9f2ea7b28bc6c24fa91e5770435# Parent  fbea179620e6074866c2375dcbe8aa8697458b6d
Merge fix for Bug 3596

diff -r fe4f904300fc -r b0a26d6936b2 phoneengine/phonemodel/src/cpemessagehandler.cpp
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Thu Sep 02 15:50:39 2010 +0100
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Thu Sep 09 18:09:57 2010 +0100
@@ -2459,8 +2459,10 @@
         {
         iModel.SendMessage( MEngineMonitor::EPEMessageInValidEmergencyNumber );
         }
-
-    return errorCode;
+    // CPhCltEmergencyCall::IsEmergencyPhoneNumber can legitamately return an error code
+    // This simply means that the number is NOT an emergency number (eg it can return KErrArgument)
+    // Therefore we are ignoring any KErrArgument errors that come from this
+    return (errorCode == KErrArgument) ? ECCPErrorNone : errorCode;
     }
 
 // -----------------------------------------------------------------------------