From 06de7bc1e1a0273cb2573c0e16b0c2ba1454357c Mon Sep 17 00:00:00 2001
From: Sijmen Schoon <sijmenschoon@gmail.com>
Date: Mon, 11 Jul 2016 19:02:20 +0200
Subject: [PATCH] Set default track folder to user track directory

Fixes #4019
---
 src/windows/loadsave.c | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c
index 6db2ce2a84..875eb83b2c 100644
--- a/src/windows/loadsave.c
+++ b/src/windows/loadsave.c
@@ -243,24 +243,16 @@ rct_window *window_loadsave_open(int type, char *defaultName)
 		window_loadsave_populate_list(w, includeNewItem, path, ".sc6");
 		break;
 	case LOADSAVETYPE_TRACK:
-		/*
-		Uncomment when user tracks are separated
-		 
+		if (gConfigGeneral.last_save_track_directory && platform_ensure_directory_exists(gConfigGeneral.last_save_track_directory))
+			safe_strcpy(path, gConfigGeneral.last_save_track_directory, MAX_PATH);
+		else
+			platform_get_user_directory(path, "track");
+			
 		if (!platform_ensure_directory_exists(path)) {
 			log_error("Unable to create tracks directory.");
 			window_close(w);
 			return NULL;
 		}
-		*/
-			
-		if (gConfigGeneral.last_save_track_directory && platform_ensure_directory_exists(gConfigGeneral.last_save_track_directory))
-			safe_strcpy(path, gConfigGeneral.last_save_track_directory, MAX_PATH);
-		else {
-			safe_strcpy(path, gRCT2AddressTracksPath, MAX_PATH);
-			ch = strchr(path, '*');
-			if (ch != NULL)
-				*ch = 0;
-		}
 		
 		window_loadsave_populate_list(w, includeNewItem, path, ".td?");
 		break;
@@ -417,21 +409,9 @@ static void window_loadsave_mouseup(rct_window *w, int widgetIndex)
 			break;
 				
 		case LOADSAVETYPE_TRACK:
-		{
-			/*
-			Uncomment when tracks get separated
-			
 			platform_get_user_directory(directory, "track");
-			*/
-
-			safe_strcpy(directory, gRCT2AddressTracksPath, MAX_PATH);
-			char *ch = strchr(directory, '*');
-			if (ch != NULL)
-				*ch = 0;
-
 			break;
 		}
-		}
 		
 		window_loadsave_populate_list(w, includeNewItem, directory, _extension);
 		window_init_scroll_widgets(w);