Finally fix copying!

Conky-for-macOS · Oct 9, 2018 · 103ace6 · 103ace6
1 parent 567e0ed
commit 103ace6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Manage Conky/SaveWidgetSheetController.m b/Manage Conky/SaveWidgetSheetController.m
@@ -17,7 +17,7 @@ - (void)awakeFromNib
     static BOOL beenHereAgain = NO;
     if (beenHereAgain) { return; }
     beenHereAgain = YES;
-
+    
     resourcesLocations = [NSMutableArray array];
     [_scriptView setSyntaxDefinitionName:@"lua"];
 }
@@ -38,7 +38,7 @@ - (IBAction)addPreview:(id)sender
     [op setPrompt:@"Add"];
     [op setAllowedFileTypes:@[@"png", @"jpg", @"jpeg", @"tiff"]];
     NSModalResponse res = [op runModal];
-
+    
     if (res == NSModalResponseOK)
     {
         self->previewLocation = op.URL;
@@ -80,7 +80,7 @@ - (IBAction)saveButton:(id)sender
 
         /* delete any previous versions */
         [fm removeItemAtPath:widgetDirectory error:nil];
-
+        
         /* create widget directory */
         [fm createDirectoryAtPath:widgetDirectory withIntermediateDirectories:NO attributes:nil error:&error];
         if (error)
@@ -101,9 +101,9 @@ - (IBAction)saveButton:(id)sender
         [fm createFileAtPath:widgetCreator
                     contents:[_widgetCreatorField.stringValue dataUsingEncoding:NSUTF8StringEncoding]
                   attributes:nil];
-
+        
         /* copy preview */
-        [fm copyItemAtPath:previewLocation.path toPath:widgetDirectory error:&error];
+        [fm copyItemAtPath:previewLocation.path toPath:[widgetDirectory stringByAppendingPathComponent:[previewLocation.path lastPathComponent]] error:&error];
         if (error)
         {
             NSLog(@"%@", error);
@@ -112,7 +112,7 @@ - (IBAction)saveButton:(id)sender
         /* copy resources */
         for (NSURL *resource in resourcesLocations)
         {
-            [fm copyItemAtPath:resource.path toPath:widgetDirectory error:&error];
+            [fm copyItemAtPath:resource.path toPath:[widgetDirectory stringByAppendingPathComponent:[resource.path lastPathComponent]] error:&error];
             if (error)
             {
                 NSLog(@"%@", error);