davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix bug in OpenRecordingsDir action 

It used the wrong directory in case of recording dir structure was set
to ONE_DIR_PER_RECORDING
This commit is contained in:
0xb00bface 2020-12-27 15:49:32 +01:00
parent 53684668ab
commit 985ce12f52
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/main/java/ctbrec/ui/action/OpenRecordingsDir.java
View File

@ -6,6 +6,7 @@ import java.util.concurrent.CompletableFuture;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.Settings.DirectoryStructure;
import ctbrec.ui.DesktopIntegration; import ctbrec.ui.DesktopIntegration;
import ctbrec.ui.controls.Dialogs; import ctbrec.ui.controls.Dialogs;
import javafx.scene.Cursor; import javafx.scene.Cursor;
@ -24,7 +25,7 @@ public class OpenRecordingsDir {
public void execute() { public void execute() {
source.setCursor(Cursor.WAIT); source.setCursor(Cursor.WAIT);
File fileForRecording = Config.getInstance().getFileForRecording(selectedModel, ".mp4", Instant.now()); File fileForRecording = Config.getInstance().getFileForRecording(selectedModel, ".mp4", Instant.now());
File dir = fileForRecording.getParentFile(); final File dir = getModelDirectory(fileForRecording);
if (dir.exists()) { if (dir.exists()) {
CompletableFuture.runAsync(() -> DesktopIntegration.open(dir)); CompletableFuture.runAsync(() -> DesktopIntegration.open(dir));
} else { } else {
@ -32,4 +33,12 @@ public class OpenRecordingsDir {
} }
source.setCursor(Cursor.DEFAULT); source.setCursor(Cursor.DEFAULT);
} }
private File getModelDirectory(File fileForRecording) {
File dir = fileForRecording.getParentFile();
if (Config.getInstance().getSettings().recordingsDirStructure == DirectoryStructure.ONE_PER_RECORDING) {
dir = dir.getParentFile();
}
return dir;
}
} }