From c06e17ac986bec7a061a60c2c5101c28be6eef1e Mon Sep 17 00:00:00 2001
From: Unknown <minaciousgrace@gmail.com>
Date: Fri, 20 Jul 2018 05:19:44 -0400
Subject: [PATCH] load editable data after xml data so display names are set
 from there

---
 src/Profile.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Profile.cpp b/src/Profile.cpp
index a238fe2af1..771768da83 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -837,8 +837,6 @@ ProfileLoadResult Profile::LoadAllFromDir( const RString &sDir, bool bRequireSig
 	InitAll();
 
 	LoadTypeFromDir(sDir);
-	// Not critical if this fails
-	LoadEditableDataFromDir( sDir );
 	DBProf.SetLoadingProfile(this);
 	XMLProf.SetLoadingProfile(this);
 	ProfileLoadResult ret = XMLProf.LoadEttFromDir(sDir);
@@ -851,6 +849,8 @@ ProfileLoadResult Profile::LoadAllFromDir( const RString &sDir, bool bRequireSig
 		IsEtternaProfile = true;
 		ImportScoresToEtterna();
 	}
+	// Not critical if this fails
+	LoadEditableDataFromDir(sDir);
 
 	// move old profile specific replays to the new aggregate folder
 	RString oldreplaydir = sDir + "ReplayData/";