mac: replay, fix savestate download; cmake, mkdir p

blueminder · Oct 25, 2023 · a723c9b · a723c9b
1 parent 2027f46
commit a723c9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1618,7 +1618,7 @@ if(NOT LIBRETRO)
 			add_custom_command(
 				OUTPUT ${CMAKE_SOURCE_DIR}/training
 				WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-				COMMAND mkdir training
+				COMMAND mkdir -p training
 				COMMAND wget https://github.com/blueminder/flycast-dojo-training/archive/main.tar.gz
 				COMMAND tar zxvf main.tar.gz
 				COMMAND cp flycast-dojo-training-main/*.lua training/
@@ -1803,7 +1803,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT LIBRETRO)
 	add_custom_command(
 		OUTPUT ${CMAKE_SOURCE_DIR}/training
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND mkdir training
+		COMMAND mkdir -p training
 		COMMAND wget https://github.com/blueminder/flycast-dojo-training/archive/main.tar.gz
 		COMMAND tar zxvf main.tar.gz
 		COMMAND cp flycast-dojo-training-main/*.lua training/

diff --git a/core/dojo/DojoGui.cpp b/core/dojo/DojoGui.cpp
@@ -2569,6 +2569,16 @@ void DojoGui::invoke_download_save_popup(std::string game_path, bool* net_save_d
 	dojo_file.start_save_download = true;
 	dojo_file.game_path = game_path;
 
+#if defined(__APPLE__)
+	if (config::Receiving && dojo_file.source_url.empty())
+	{
+		if (settings.dojo.state_commit.empty())
+			dojo_file.DownloadNetSave(short_game_name);
+		else
+			dojo_file.DownloadNetSave(short_game_name, settings.dojo.state_commit);
+	}
+#endif
+
 	*net_save_download = true;
 }