[Scummvm-cvs-logs] SF.net SVN: scummvm:[34106] scummvm/branches/branch-0-12-0/backends/fs/ symbian/symbian-fs.cpp

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Fri Aug 22 22:18:30 CEST 2008


Revision: 34106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34106&view=rev
Author:   anotherguest
Date:     2008-08-22 20:18:29 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
Very small and tested fix to retrieve the FileSession properly. (Avoid crash)

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/backends/fs/symbian/symbian-fs.cpp

Modified: scummvm/branches/branch-0-12-0/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/fs/symbian/symbian-fs.cpp	2008-08-22 13:55:10 UTC (rev 34105)
+++ scummvm/branches/branch-0-12-0/backends/fs/symbian/symbian-fs.cpp	2008-08-22 20:18:29 UTC (rev 34106)
@@ -24,6 +24,7 @@
 
 #if defined (__SYMBIAN32__)
 #include "backends/fs/abstract-fs.h"
+#include "backends/platform/symbian/src/SymbianOS.h"
 
 #include <dirent.h>
 #include <eikenv.h>
@@ -62,7 +63,7 @@
 		TFileName fname;
 		TPtrC8 ptr((const unsigned char*)_path.c_str(),_path.size());
 		fname.Copy(ptr);
-		TBool fileExists = BaflUtils::FileExists(CEikonEnv::Static()->FsSession(), fname);
+		TBool fileExists = BaflUtils::FileExists(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), fname);
 		return fileExists;
 	}
 	virtual String getDisplayName() const { return _displayName; }
@@ -142,7 +143,7 @@
 	TPtrC8 ptr((const unsigned char*)_path.c_str(),_path.size());
 	fname.Copy(ptr);
 
-	if (CEikonEnv::Static()->FsSession().Entry(fname, fileAttribs) == KErrNone) {
+	if (static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession().Entry(fname, fileAttribs) == KErrNone) {
 		_isValid = true;
 		_isDirectory = fileAttribs.IsDir();
 	} else {
@@ -163,7 +164,7 @@
 	TFileName fname;
 	fname.Copy(ptr);
 	TBool isFolder = EFalse;
-	BaflUtils::IsFolder(CEikonEnv::Static()->FsSession(), fname, isFolder);
+	BaflUtils::IsFolder(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), fname, isFolder);
 	if (!isFolder)
 		return 0;
 
@@ -177,7 +178,7 @@
 
 	if (_isPseudoRoot) {
 		// Drives enumeration
-		RFs fs = CEikonEnv::Static()->FsSession();
+		RFs& fs = static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession();
 		TInt driveNumber;
 		TChar driveLetter;
 		TUint driveLetterValue;
@@ -218,7 +219,7 @@
 		fname.Copy(ptr);
 		TBuf8<256>nameBuf;
 		CDir* dirPtr;
-		if (CEikonEnv::Static()->FsSession().GetDir(fname,KEntryAttNormal|KEntryAttDir,0,dirPtr)==KErrNone) {
+		if (static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession().GetDir(fname,KEntryAttNormal|KEntryAttDir,0,dirPtr)==KErrNone) {
 			CleanupStack::PushL(dirPtr);
 			TInt cnt=dirPtr->Count();
 			for (TInt loop=0;loop<cnt;loop++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list