From 82ea765b3563899f984bff93403a55dbc53b885f Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Thu, 28 Jan 2016 09:20:16 +1100
Subject: [PATCH] Remove reliance on static acquaintances_initialized variable

It wasn't set to true anywhere before anyway
---
 src/game_preferences.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/game_preferences.cpp b/src/game_preferences.cpp
index fb1263111861..e2905e1bbd3d 100644
--- a/src/game_preferences.cpp
+++ b/src/game_preferences.cpp
@@ -64,8 +64,6 @@ std::map<std::string, std::vector<std::string> > history_map;
 
 std::map<std::string, preferences::acquaintance> acquaintances;
 
-bool acquaintances_initialized = false;
-
 std::vector<std::string> mp_modifications;
 bool mp_modifications_initialized = false;
 std::vector<std::string> sp_modifications;
@@ -241,8 +239,7 @@ admin_authentication_reset::~admin_authentication_reset()
 }
 
 static void load_acquaintances() {
-	if(!acquaintances_initialized) {
-		acquaintances.clear();
+	if(acquaintances.empty()) {
 		BOOST_FOREACH(const config &acfg, preferences::get_prefs()->child_range("acquaintance")) {
 			acquaintance ac = acquaintance(acfg);
 			acquaintances[ac.get_nick()] = ac;