From 48a94f32d9ecf1345befd3769cbef118783695a8 Mon Sep 17 00:00:00 2001
From: Bart van Strien <bart@bartbes.ath.cx>
Date: Wed, 4 Aug 2010 14:22:30 +0200
Subject: [PATCH] newThread now accepts files

---
 src/modules/thread/sdl/wrap_Thread.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/thread/sdl/wrap_Thread.cpp b/src/modules/thread/sdl/wrap_Thread.cpp
index 531a1907a..bcfd6b036 100644
--- a/src/modules/thread/sdl/wrap_Thread.cpp
+++ b/src/modules/thread/sdl/wrap_Thread.cpp
@@ -256,9 +256,13 @@ namespace sdl
 	int w_newThread(lua_State *L)
 	{
 		std::string name = luaL_checkstring(L, 1);
+		love::Data *data;
 		if (lua_isstring(L, 2))
-			luax_convobj(L, 2, "filesystem", "read");
-		love::Data *data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
+			luax_convobj(L, 2, "filesystem", "newFile");
+		if (luax_istype(L, 2, FILESYSTEM_FILE_T))
+			data = luax_checktype<love::filesystem::File>(L, 2, "File", FILESYSTEM_FILE_T)->read();
+		else
+			data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
 		Thread *t = instance->newThread(name, data);
 		luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
 		return 1;