From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Mon, 5 Aug 2013 08:58:08 +0000 (-0400)
Subject: always read default_settings.txt before reading the world-folder's settings file
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=dbf775808a63013ef7fd45faadab7f4d289c44a4;p=zefram%2Fminetest%2Fmoretrees.git

always read default_settings.txt before reading the world-folder's settings file

also close the file after copying.
---

diff --git a/init.lua b/init.lua
index c0a2aaa..39fd4ab 100644
--- a/init.lua
+++ b/init.lua
@@ -18,15 +18,14 @@
 
 moretrees = {}
 
--- If the config file is not found in the world directory, copy the default
--- settings to that location and read them in.
+-- Read the default config file (and if necessary, copy it to the world folder).
 
 local worldpath=minetest.get_worldpath()
 local modpath=minetest.get_modpath("moretrees")
 
-if io.open(worldpath.."/moretrees_settings.txt","r") == nil then
+dofile(modpath.."/default_settings.txt")
 
-	dofile(modpath.."/default_settings.txt")
+if io.open(worldpath.."/moretrees_settings.txt","r") == nil then
 
 	io.input(modpath.."/default_settings.txt")
 	io.output(worldpath.."/moretrees_settings.txt")
@@ -34,7 +33,10 @@ if io.open(worldpath.."/moretrees_settings.txt","r") == nil then
 	local size = 2^13      -- good buffer size (8K)
 	while true do
 		local block = io.read(size)
-		if not block then break end
+		if not block then
+			io.close()
+			break
+		end
 		io.write(block)
 	end