2 files changed, 22 insertions, 8 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index b1c7a050..9478b1b8 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -568,11 +568,6 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
     if(!profile)
         return QString();
 
-    for (auto cp : getClassPath())
-    {
-        launchScript += "classPath " + cp + "\n";
-    }
-
     auto mainClass = getMainClass();
     if (!mainClass.isEmpty())
     {
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index 3df4e541..ce477ad7 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -95,8 +95,8 @@ bool fitsInLocal8bit(const QString & string)
 
 void LauncherPartLaunch::executeTask()
 {
-    QString newLaunchJar = APPLICATION->getJarPath("NewLaunch.jar");
-    if (newLaunchJar.isEmpty())
+    QString jarPath = APPLICATION->getJarPath("NewLaunch.jar");
+    if (jarPath.isEmpty())
     {
         const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
         emit logLine(tr(reason), MessageLevel::Fatal);
@@ -119,6 +119,9 @@ void LauncherPartLaunch::executeTask()
     // make detachable - this will keep the process running even if the object is destroyed
     m_process.setDetachable(true);
 
+    auto classPath = minecraftInstance->getClassPath();
+    classPath.prepend(jarPath);
+
     auto natPath = minecraftInstance->getNativePath();
 #ifdef Q_OS_WIN
     if (!fitsInLocal8bit(natPath))
@@ -134,7 +137,23 @@ void LauncherPartLaunch::executeTask()
 #endif
 
     args << "-cp";
-    args << newLaunchJar;
+#ifdef Q_OS_WIN
+    QStringList processed;
+    for(auto & item: classPath)
+    {
+        if (!fitsInLocal8bit(item))
+        {
+            processed << shortPathName(item);
+        }
+        else
+        {
+            processed << item;
+        }
+    }
+    args << processed.join(';');
+#else
+    args << classPath.join(':');
+#endif
     args << "org.polymc.EntryPoint";
 
     qDebug() << args.join(' ');