fix missing wc3RunArgs detection

wurstscript · Dec 29, 2019 · 2c46847 · 2c46847
1 parent c4257ab
commit 2c46847
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java
@@ -18,6 +18,7 @@
 import de.peeeq.wurstscript.utils.Utils;
 import net.moonlightflower.wc3libs.port.GameVersion;
 import net.moonlightflower.wc3libs.port.Orient;
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.lsp4j.MessageType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -140,7 +141,7 @@ public Object execute(ModelManager modelManager) throws IOException {
                     }
                     List<String> cmd = Lists.newArrayList(gameExe.getAbsolutePath());
                     String wc3RunArgs = configProvider.getWc3RunArgs();
-                    if (wc3RunArgs == null) {
+                    if (wc3RunArgs == null || StringUtils.isBlank(wc3RunArgs)) {
                         if (W3Utils.getWc3PatchVersion().compareTo(VERSION_1_32) >= 0) {
                             cmd.add("-launch");
                         }

diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3Utils.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3Utils.java
@@ -67,7 +67,7 @@ public static GameVersion parsePatchVersion(File wc3Path) {
                 } else if (Orient.isMacSystem()) {
                     W3Utils.version = new MacGameVersionFinder().get();
                 }
-                WLogger.info("Parsed game version: " + version);
+                WLogger.info("Parsed custom game version: " + version);
             } catch (IOException | NotFoundException e) {
                 WLogger.severe(e);
             }