Skip to content

Commit 6afc91c

Browse files
authored
Merge pull request #105 from cisco-system-traffic-generator/windows-daemon-fixes
Fixed invalid path format in TRex start from Daemon
2 parents ec0ec41 + 907121e commit 6afc91c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/java/com/exalttech/trex/ui/controllers/daemon/ConfigTreeItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private Node createInterfacesSelectionControl() {
194194
}
195195

196196
private Node createListControl() {
197-
Button button = new Button("");
197+
Button button = new Button("\u2795");
198198
button.getStyleClass().add("normalButton");
199199
button.setOnAction(event -> {
200200
ConfigNode newChild = this.configNode.addListItem();

src/main/java/com/exalttech/trex/ui/controllers/daemon/TRexDaemonDialogController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import javafx.scene.control.TextField;
4040
import javafx.scene.layout.*;
4141
import javafx.stage.Stage;
42+
import org.apache.commons.io.FilenameUtils;
4243
import org.apache.http.client.methods.CloseableHttpResponse;
4344
import org.apache.http.client.methods.HttpPost;
4445
import org.apache.http.entity.StringEntity;
@@ -322,7 +323,7 @@ private void startTRex() {
322323
.returnAs(String.class)
323324
.execute();
324325

325-
cmdParams.put("cfg", Paths.get(files_path, configFilename));
326+
cmdParams.put("cfg", FilenameUtils.separatorsToUnix(Paths.get(files_path, configFilename).toString()));
326327
} catch (RuntimeException ex) {
327328
log(LogType.ERROR, MessageFormat.format("Unable to get user configs path: {0}", ex));
328329
}

0 commit comments

Comments
 (0)