From 497fd7f714f4f9e0250febbb6b1153a2ab33718c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 18 Jul 2017 13:29:03 -0700
Subject: [PATCH] Pin File pointer during eject

---
 libraries/shared/src/shared/FileCache.cpp | 3 ++-
 libraries/shared/src/shared/FileCache.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/shared/src/shared/FileCache.cpp b/libraries/shared/src/shared/FileCache.cpp
index 695336847e..9957c6bfc6 100644
--- a/libraries/shared/src/shared/FileCache.cpp
+++ b/libraries/shared/src/shared/FileCache.cpp
@@ -258,7 +258,8 @@ namespace cache {
     };
 }
 
-void FileCache::eject(const FilePointer& file) {
+// Take file pointer by value to insure it doesn't get destructed during the "erase()" calls
+void FileCache::eject(FilePointer file) {
     file->_locked = false;
     const auto& length = file->getLength();
     const auto& key = file->getKey();
diff --git a/libraries/shared/src/shared/FileCache.h b/libraries/shared/src/shared/FileCache.h
index 1580674ca0..94fa57457a 100644
--- a/libraries/shared/src/shared/FileCache.h
+++ b/libraries/shared/src/shared/FileCache.h
@@ -119,7 +119,7 @@ private:
     void clean();
     void clear();
     // Remove a file from the cache
-    void eject(const FilePointer& file);
+    void eject(FilePointer file);
 
     size_t getOverbudgetAmount() const;