summaryrefslogtreecommitdiff
path: root/src/settings.h
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-01-24 15:56:49 +0100
committerWeblate <42@minetest.ru>2013-01-24 15:56:49 +0100
commit13358c29b8a754709c49b0ba997f029af26134bc (patch)
tree9e7e5efc0f1a97986206fe5e7f0debf5d20e6a28 /src/settings.h
parentaaee2786a76dedb52b154223dac813ac02099a91 (diff)
parent035933f806d3afc45e2e558e505318489209a70b (diff)
downloadminetest-13358c29b8a754709c49b0ba997f029af26134bc.tar.gz
minetest-13358c29b8a754709c49b0ba997f029af26134bc.tar.bz2
minetest-13358c29b8a754709c49b0ba997f029af26134bc.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src/settings.h')
-rw-r--r--src/settings.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/settings.h b/src/settings.h
index 6d6db220c..2b46676c6 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -244,7 +244,9 @@ public:
updated[name] = true;
}
-
+ else //file contains a setting which is not in m_settings
+ value_changed=true;
+
return true;
}