Merge branch 'development'

Bentroen · Bentroen · commit 0a3ce39324eb · 2021-09-25T04:38:48.000-03:00
diff --git a/datafiles/Data/wallpaper.bat b/datafiles/Data/wallpaper.bat
@@ -1 +1 @@
-copy /Y %appdata%\Microsoft\Windows\Themes\TranscodedWallpaper "%1Wallpaper.jpg"
+copy /Y "%appdata%\Microsoft\Windows\Themes\TranscodedWallpaper" "%~dp0\Wallpaper.jpg"
diff --git a/scripts/control_create/control_create.gml b/scripts/control_create/control_create.gml
@@ -50,7 +50,7 @@ function control_create() {
 	display_height = display_get_height()
 	wpaper = 0
 	wpaperside = 0
-	ExecuteShell("\"" + data_directory + "wallpaper.bat \"" + data_directory, true, true)
+	ExecuteShell("\"" + data_directory + "wallpaper.bat", true, true)
 	wpaperexist = file_exists(data_directory + "Wallpaper.jpg")
 	if (wpaperexist) {
 		wpaper = sprite_add(data_directory + "Wallpaper.jpg", 1, 0, 0, 0, 0)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-copy /Y %appdata%\Microsoft\Windows\Themes\TranscodedWallpaper "%1Wallpaper.jpg"`
	`1`	`+copy /Y "%appdata%\Microsoft\Windows\Themes\TranscodedWallpaper" "%~dp0\Wallpaper.jpg"`