From 37f433a7ad516df85cd62e32e1a178635212b047 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Sun, 12 Feb 2006 00:27:19 +0000
Subject: * New and tested builds for S60V3 and UIQ3 * New upscaled icons for
 UIQ3/S60V3. SVG/Scalable version needed for S60V3 for proper good looks *
 Critical bug in Symbian-fs fixed (exception for UIQ3/S60V3) *Removed
 duplicate files for easier maintanence *New handling for Symbian error
 messages, save paths etc *All naming now is ScummVM for all apps and targets

svn-id: r20585
---
 backends/fs/symbian/symbian-fs.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'backends/fs/symbian')

diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp
index 7a26a0f437..0e9cbba86c 100644
--- a/backends/fs/symbian/symbian-fs.cpp
+++ b/backends/fs/symbian/symbian-fs.cpp
@@ -114,6 +114,7 @@ FSList SymbianFilesystemNode::listDir(ListMode mode) const {
 		RFs fs = CEikonEnv::Static()->FsSession();
 		TInt driveNumber;
 		TChar driveLetter;
+		TUint driveLetterValue;
 		TVolumeInfo volumeInfo;
 		TBuf8<30> driveLabel8;
 		TBuf8<30> driveString8;
@@ -122,12 +123,16 @@ FSList SymbianFilesystemNode::listDir(ListMode mode) const {
 			TInt err = fs.Volume(volumeInfo, driveNumber);
 			if (err != KErrNone)
 				continue; 
-			User::LeaveIfError(fs.DriveToChar(driveNumber,driveLetter));
+			if(fs.DriveToChar(driveNumber,driveLetter) != KErrNone)
+				continue;
+
+			driveLetterValue = driveLetter;
+
 			if(volumeInfo.iName.Length() > 0) {				
 				driveLabel8.Copy(volumeInfo.iName); // 16 to 8bit des // enabling this line alone gives KERN-EXEC 3 with non-optimized GCC? WHY? grrr
-				driveString8.Format(_L8("Drive %c: (%S)"), driveLetter, &driveLabel8);
+				driveString8.Format(_L8("Drive %c: (%S)"), driveLetterValue, &driveLabel8);
 			} else {
-				driveString8.Format(_L8("Drive %c:"), driveLetter);
+				driveString8.Format(_L8("Drive %c:"), driveLetterValue);
 			}
 				
 			char path[10];
-- 
cgit v1.2.3