Bläddra i källkod

device: use path::join()

Daniele Bartolini 6 år sedan
förälder
incheckning
2241efcfa6
1 ändrade filer med 4 tillägg och 7 borttagningar
  1. 4 7
      src/device/device.cpp

+ 4 - 7
src/device/device.cpp

@@ -357,13 +357,10 @@ void Device::run()
 	{
 		TempAllocator512 ta;
 		DynamicString boot_dir(ta);
-
-		if (_device_options._boot_dir != NULL)
-		{
-			boot_dir += _device_options._boot_dir;
-			boot_dir += '/';
-		}
-		boot_dir += CROWN_BOOT_CONFIG;
+		path::join(boot_dir
+			, (_device_options._boot_dir != NULL) ? _device_options._boot_dir : ""
+			, CROWN_BOOT_CONFIG
+			);
 
 		const StringId64 config_name(boot_dir.c_str());
 		_resource_manager->load(RESOURCE_TYPE_CONFIG, config_name);