# HG changeset patch
# User Tom Pritchard <tomp@symbian.org>
# Date 1282067121 -3600
# Node ID fbea179620e6074866c2375dcbe8aa8697458b6d
# Parent  7e4661f76547e061aef848e43bb6b8fcb85380da
Patch for BUG 3596 -  Phone app crashes when dialling a number from 3.0.1 onwards

diff -r 7e4661f76547 -r fbea179620e6 phoneengine/phonemodel/src/cpemessagehandler.cpp
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Mon Jul 12 15:53:34 2010 +0100
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Tue Aug 17 18:45:21 2010 +0100
@@ -2443,8 +2443,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;
     }
 
 // -----------------------------------------------------------------------------