Fix current dir

UnrealKaraulov · Dec 6, 2023 · 0db9764 · 0db9764
1 parent 91e16dd
commit 0db9764
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/editor/Renderer.cpp b/src/editor/Renderer.cpp
@@ -806,9 +806,9 @@ void Renderer::loadFgds()
 		}
 		else
 		{
+			FindPathInAssets(NULL, g_settings.fgdPaths[i].path, newFgdPath, true);
 			logf(get_localized_string(LANG_0910), g_settings.fgdPaths[i].path);
-			if (!FindPathInAssets(NULL, g_settings.fgdPaths[i].path, newFgdPath, true))
-				g_settings.fgdPaths[i].enabled = false;
+			g_settings.fgdPaths[i].enabled = false;
 			continue;
 		}
 	}

diff --git a/src/main.cpp b/src/main.cpp
@@ -338,6 +338,7 @@ int noclip(CommandLine& cli)
 			if (!cli.hasOption("-hull"))
 			{
 				logf(get_localized_string(LANG_0010));
+				delete map;
 				return 1;
 			}
 			redirect = cli.getOptionInt("-redirect");
@@ -458,6 +459,7 @@ int simplify(CommandLine& cli)
 			if (hull < 1 || hull >= MAX_MAP_HULLS)
 			{
 				logf(get_localized_string(LANG_0024));
+				delete map;
 				return 1;
 			}
 		}
@@ -585,6 +587,7 @@ int transform(CommandLine& cli)
 		delete map;
 		return 0;
 	}
+	delete map;
 	return 1;
 }
 

diff --git a/src/util/util.cpp b/src/util/util.cpp
@@ -1493,14 +1493,14 @@ void FixupAllSystemPaths()
 	fixupPath(g_settings.gamedir, FIXUPPATH_SLASH::FIXUPPATH_SLASH_SKIP, FIXUPPATH_SLASH::FIXUPPATH_SLASH_CREATE);
 	if (!dirExists(g_settings.gamedir))
 	{
-		if (!dirExists(g_current_dir + g_settings.gamedir))
+		if (!dirExists(GetCurrentDir() + g_settings.gamedir))
 		{
 			logf("Error{}: Gamedir {} not exits!", "[1]", g_settings.gamedir);
-			logf("Error{}: Gamedir {} not exits!", "[2]", g_current_dir + g_settings.gamedir);
+			logf("Error{}: Gamedir {} not exits!", "[2]", GetCurrentDir() + g_settings.gamedir);
 		}
 		else
 		{
-			g_game_dir = g_current_dir + g_settings.gamedir;
+			g_game_dir = GetCurrentDir() + g_settings.gamedir;
 		}
 	}
 	else
@@ -1518,7 +1518,7 @@ void FixupAllSystemPaths()
 		*/
 		fixupPath(g_settings.workingdir, FIXUPPATH_SLASH::FIXUPPATH_SLASH_REMOVE, FIXUPPATH_SLASH::FIXUPPATH_SLASH_CREATE);
 
-		if (!dirExists(g_current_dir + g_settings.workingdir))
+		if (!dirExists(GetCurrentDir() + g_settings.workingdir))
 		{
 			if (!dirExists(g_game_dir + g_settings.workingdir))
 			{
@@ -1532,7 +1532,7 @@ void FixupAllSystemPaths()
 		}
 		else
 		{
-			g_working_dir = g_current_dir + g_settings.workingdir;
+			g_working_dir = GetCurrentDir() + g_settings.workingdir;
 		}
 	}
 	else