# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271253039 -10800
# Node ID fe0554130c0f53ee5712882f23137d51db61a638
# Parent  3fdbad865a1ad3ba699b17e7a9c8eb22a302ada8
Revision: 201013
Kit: 201015

diff -r 3fdbad865a1a -r fe0554130c0f remotestoragefw/mountmanager/src/rsfwmountmanimpl.cpp
--- a/remotestoragefw/mountmanager/src/rsfwmountmanimpl.cpp	Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/mountmanager/src/rsfwmountmanimpl.cpp	Wed Apr 14 16:50:39 2010 +0300
@@ -396,7 +396,7 @@
 TInt CRsfwMountManImpl::GetRsfwControlConnection()
     {
     TInt err = KErrNone;
-    if (!iRsfwControlConnected)
+//    if (!iRsfwControlConnected)
         {
         err = iRsfwControl.Connect();
         if (!err) 
diff -r 3fdbad865a1a -r fe0554130c0f remotestoragefw/mountmanager/src/rsfwmountutils.cpp
--- a/remotestoragefw/mountmanager/src/rsfwmountutils.cpp	Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/mountmanager/src/rsfwmountutils.cpp	Wed Apr 14 16:50:39 2010 +0300
@@ -268,6 +268,7 @@
         // if fetching the list of implemenations fail,'
         // (for example a temporary out of memory situation)
         // just accept the string
+		implinfo.ResetAndDestroy();
         return ETrue;
         }
      
@@ -279,12 +280,14 @@
     _LIT8(KDelimiter, "://");
     if (aDriveAddress.Length() < protocol.Length()+3) 
         {
+		implinfo.ResetAndDestroy();
         return EFalse;
         }
     
     TPtrC8 test = aDriveAddress.Mid(protocol.Length(), 3);
     if (!(test.Compare(KDelimiter) == 0)) 
         {
+		implinfo.ResetAndDestroy();
         return EFalse;    
         }
     
diff -r 3fdbad865a1a -r fe0554130c0f remotestoragefw/remotefileengine/src/rsfwconnectionmanager.cpp
--- a/remotestoragefw/remotefileengine/src/rsfwconnectionmanager.cpp	Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/remotefileengine/src/rsfwconnectionmanager.cpp	Wed Apr 14 16:50:39 2010 +0300
@@ -279,7 +279,15 @@
     else
         {
         DEBUGSTRING(("StartConnection called twice!"));
-        err = KErrGeneral;
+        Cancel();
+                
+        DEBUGSTRING(("StartConnection Cancel!"));
+
+        iConnection.ProgressNotification(iProgress, iStatus);
+        DEBUGSTRING(("CRsfwConnectionManager iConnection.ProgressNotification!"));
+
+        SetActive();
+       
         }
     return err;
     }
diff -r 3fdbad865a1a -r fe0554130c0f remotestoragefw/webdavaccessplugin/src/rsfwdavaccesscontext.cpp
--- a/remotestoragefw/webdavaccessplugin/src/rsfwdavaccesscontext.cpp	Wed Mar 31 23:00:11 2010 +0300
+++ b/remotestoragefw/webdavaccessplugin/src/rsfwdavaccesscontext.cpp	Wed Apr 14 16:50:39 2010 +0300
@@ -193,8 +193,8 @@
     {
     DEBUGSTRING(("DAV: OptionsL raw err=%d", aError));
     if ((aError == KErrCommsLineFail) ||
-        (aError == KErrNotReady) ||
-        (aError == KErrDisconnected))
+        (aError == KErrNotReady) )
+//        (aError == KErrDisconnected))
         {
         iTryCount--;
         }