diff -r 5b5d147c7838 -r bbf8bed59bcb userlibandfileserver/fileserver/sfile/sf_local.cpp --- a/userlibandfileserver/fileserver/sfile/sf_local.cpp Tue May 25 14:09:55 2010 +0300 +++ b/userlibandfileserver/fileserver/sfile/sf_local.cpp Wed Jun 09 11:10:19 2010 +0300 @@ -386,7 +386,8 @@ __ASSERT_ALWAYS(aDrive>=0 && aDrive= KMaxLocalDrives && iProxyDriveMapping[iMapping[aDrive]-KMaxLocalDrives],Fault(EClearProxyDriveMapping2)); TInt idx = iMapping[aDrive]-KMaxLocalDrives; - delete iProxyDriveMapping[idx]; + if (iProxyDriveMapping[idx]->Mount() == NULL) // don't delete if it's still owned by its mount + delete iProxyDriveMapping[idx]; iProxyDriveMapping[idx] = NULL; iMapping[aDrive] = KDriveInvalid; }