Fix lang debug

UnrealKaraulov · Dec 5, 2023 · 73f8172 · 73f8172
1 parent f76cd17
commit 73f8172
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/editor/Gui.cpp b/src/editor/Gui.cpp
@@ -8162,7 +8162,7 @@ void Gui::drawFaceEditorWidget()
 
 						for (int v = 0; v < map->vertCount; v++)
 						{
-							if (map->verts[v].z != vec.z && VectorCompare(map->verts[v], vec, verts_merge_epsilon))
+							if (map->verts[v].z == vec.z && VectorCompare(map->verts[v], vec, verts_merge_epsilon))
 							{
 								if (vec != lastvec)
 								{

diff --git a/src/util/lang.cpp b/src/util/lang.cpp
@@ -38,7 +38,7 @@ std::string get_localized_string(int id)
 
 		return itr->second;
 	}
-	return "LANG_ERROR_INDEX";
+	return "LANG_ERROR_INDEX\n";
 }
 
 std::string get_localized_string(const std::string & str_id)
@@ -62,23 +62,29 @@ std::string get_localized_string(const std::string & str_id)
 
 		return itr->second;
 	}
-	return "LANG_ERROR_STRING";
+	return "LANG_ERROR_STRING\n";
 }
 
 void set_localize_lang(std::string lang)
 {
-	if (ft != NULL)
-	{
-		delete ft;
-	}
+	static std::string last_lang = "";
 
-	try
+	if (last_lang != lang)
 	{
-		ft = new inih::INIReader(g_config_dir + "language.ini");
-	}
-	catch(std::runtime_error runtime)
-	{
-		logf("Language parse fatal error: {}", runtime.what());
+		if (ft != NULL)
+		{
+			delete ft;
+		}
+
+		try
+		{
+			ft = new inih::INIReader(g_config_dir + "language.ini");
+		}
+		catch (std::runtime_error runtime)
+		{
+			logf("Language parse from {} fatal error: {}\n", g_config_dir + "language.ini", runtime.what());
+		}
+		last_lang = lang;
 	}
 	g_settings.language = lang;
 	lang_db.clear();