Merge branch 'master' into lsid

loginserver/server_manager.cpp

@@ -257,13 +257,15 @@ void ServerManager::DestroyServerByName(std::string l_name, std::string s_name,
 	while (iter != world_servers.end()) {
 		if ((*iter).get() == ignore) {
 			++iter;
+			continue;
 		}
 
 		if ((*iter)->GetLongName().compare(l_name) == 0 && (*iter)->GetShortName().compare(s_name) == 0) {
 			(*iter)->GetConnection()->Handle()->Disconnect();
 			iter = world_servers.erase(iter);
+			continue;
 		}
 
 		++iter;
 	}
-}
+}