Changeset 1516 for trunk/src/org/apollo/widgets/SampledTrack.java

Timestamp:

03/10/20 16:00:19 (4 years ago)

Author:

bnemhaus

Message:

Fixed an issue with saving (and subsequent loading) of new SampledTrack widgets.

File:

• trunk/src/org/apollo/widgets/SampledTrack.java (modified) (3 diffs)

trunk/src/org/apollo/widgets/SampledTrack.java

@@ -814 +814 @@
                 
                 if (trackModel != null && trackModel.getFilepath() != null &&
-                                trackModel.equals(f.getPath())) {
+                                trackModel.getFilepath().equals(f.getPath())) {
                         
                         // already have loaded
@@ -968 +968 @@
                 // If saving for the file time then get a filename
                 if (trackModel.getFilepath() == null) {
-                        File audioResource = ResourceManager.getAudioResource(localFileName, DisplayController.getCurrentFrame());
+                        Frame parentFrame = this.getParentFrame();
+                        File audioResource = ResourceManager.getAudioUnusedFilename(localFileName, parentFrame);
                         trackModel.setFilepath(audioResource.getAbsolutePath());
                         loadFilenameArgument = localFileName; // set to now local, next load will be local
@@ -1060 +1061 @@
                 //File oldLocalFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
                 File oldLocalFile = ResourceManager.getAudioResource(localFileName, getParentFrame());
+                
+                if (oldLocalFile == null) {
+                        //It was never saved and therefore does not need to be deleted.
+                        return;
+                }
+                
                 if (oldLocalFile.isFile() && oldLocalFile.exists()) {
                         try {