From 3a44c1350155cb0428f294546e0816f09a126dd7 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Mon, 10 Oct 2011 19:36:06 +0300
Subject: [PATCH] [android] Fixed recursion with GetReader

---
 platform/platform_android.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index d2dc7874a5..f85780d697 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -5,6 +5,7 @@
 
 #include <dirent.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 static string ReadPathForFile(string const & writableDir,
     string const & resourcesDir, string const & file)
@@ -25,9 +26,16 @@ Platform::Platform()
 Platform::~Platform()
 {}
 
+static bool IsFilePresent(string const & file)
+{
+  struct stat s;
+  return stat(file.c_str(), &s) == 0;
+}
+
 ModelReader * Platform::GetReader(string const & file) const
 {
-  if (IsFileExists(m_writableDir + file))
+  // can't use Platform::IsFileExists here to avoid recursion
+  if (IsFilePresent(m_writableDir + file))
     return new FileReader(ReadPathForFile(m_writableDir, m_resourcesDir, file), 10, 12);
   else
   { // paths from GetFilesInDir will already contain "assets/"
@@ -125,7 +133,7 @@ bool Platform::GetFileSize(string const & file, uint64_t & size) const
     size = ReaderPtr<Reader>(GetReader(file)).Size();
     return true;
   }
-  catch (RootException)
+  catch (RootException const &)
   {
     return false;
   }