From 4f85edb958e85713e891b19d4a4700e16632ad0e Mon Sep 17 00:00:00 2001
From: Tristan Donkers <thedonkers@gmail.com>
Date: Sun, 23 Aug 2015 10:00:51 +1000
Subject: [PATCH] Use the server_set_property() function to set property values
 in all cases.

---
 init/msm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init/msm b/init/msm
index c0d0ee3..e482a65 100755
--- a/init/msm
+++ b/init/msm
@@ -1814,11 +1814,11 @@ server_property() {
 		if [ ! -z "$from_conf" ]; then
 			# If the value is found in the server conf file (server.properties)
 			# then set that as value for the property
-			eval SERVER_$2[$1]=\"$from_conf\"
+			server_set_property "$1" "$2" "$from_conf"
 		else
 			# Otherwise use the default value
 			manager_property "DEFAULT_$2"
-			eval SERVER_$2[$1]=\"\$SETTINGS_DEFAULT_$2\"
+			server_set_property "$1" "$2" "\$SETTINGS_DEFAULT_$2"
 		fi
 
 		### Post-changes to variables after loading