Merge branch 'feature_yggdrasil' into develop

Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.

1 files changed, 3 insertions, 3 deletions

diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp
index 07e302f5..ab6536d0 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/LegacyInstance.cpp
@@ -50,7 +50,7 @@ Task *LegacyInstance::doUpdate()
 	return new LegacyUpdate(this, this);
 }
 
-MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response)
+MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account)
 {
 	MinecraftProcess *proc = new MinecraftProcess(this);
 
@@ -103,8 +103,8 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response)
 #endif
 
 		args << "-jar" << LAUNCHER_FILE;
-		args << response.player_name;
-		args << response.session_id;
+		args << account->currentProfile()->name();
+		args << account->sessionId();
 		args << windowTitle;
 		args << windowSize;
 		args << lwjgl;