Fix fix fix

MultiMC · May 17, 2023 · baa0fd8 · baa0fd8
1 parent 8a82ec5
commit baa0fd8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
@@ -396,7 +396,7 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
 static QString replaceTokensIn(QString text, QMap<QString, QString> with)
 {
     QString result;
-    QRegularExpression token_regexp("\\$\\{(.+?)\\}");
+    QRegularExpression token_regexp("\\$\\{([^}]+)\\}");
     int tail = 0;
     int head = 0;
     while (true) {
@@ -407,7 +407,7 @@ static QString replaceTokensIn(QString text, QMap<QString, QString> with)
         }
         head = match.capturedStart();
         result.append(text.mid(tail, head - tail));
-        auto key = match.captured();
+        auto key = match.captured(1);
         auto iter = with.find(key);
         if (iter != with.end())
         {