[Bibdesk-commit] SF.net SVN: bibdesk:[24770] trunk/bibdesk/BibDocument+Scripting.m

[hofman--- via Bibdesk-commit]

Revision: 24770
          http://sourceforge.net/p/bibdesk/svn/24770
Author:   hofman
Date:     2020-05-12 21:45:10 +0000 (Tue, 12 May 2020)
Log Message:
-----------
don't merge when nothing to merge, return immediately when importing async

Modified Paths:
--------------
    trunk/bibdesk/BibDocument+Scripting.m

Modified: trunk/bibdesk/BibDocument+Scripting.m
===================================================================
--- trunk/bibdesk/BibDocument+Scripting.m       2020-05-12 15:42:59 UTC (rev 
24769)
+++ trunk/bibdesk/BibDocument+Scripting.m       2020-05-12 21:45:10 UTC (rev 
24770)
@@ -1115,14 +1115,14 @@
                         [pub addFileForURL:url autoFile:NO runScriptHook:NO];
                     }
                 }
+                BDSKMergeController *mergeController = [[[BDSKMergeController 
alloc] initWithPublication:pub mergedPublication:mergePub fromDocument:self 
completionHandler:NULL] autorelease];
+                if ([overwrite unsignedIntValue] == 'no  ' || [mergeController 
mayOverwrite] == NO)
+                    [mergeController merge];
+                else if ([overwrite unsignedIntValue] == 'yes ')
+                    [mergeController mergeOverwriting];
+                else
+                    [mergeController beginSheetModalForWindow:documentWindow 
completionHandler:NULL];
             }
-            BDSKMergeController *mergeController = [[[BDSKMergeController 
alloc] initWithPublication:pub mergedPublication:mergePub fromDocument:self 
completionHandler:NULL] autorelease];
-            if ([overwrite unsignedIntValue] == 'no  ' || [mergeController 
mayOverwrite] == NO)
-                [mergeController merge];
-            else if ([overwrite unsignedIntValue] == 'yes ')
-                [mergeController mergeOverwriting];
-            else
-                [mergeController beginSheetModalForWindow:documentWindow 
completionHandler:NULL];
         };
     } else {
         handler = ^(NSArray *result){
@@ -1178,6 +1178,7 @@
                 pubs = [search searchUsingSearchTerm:searchTerm 
serverInfo:serverInfo];
             } else {
                 [search searchUsingSearchTerm:searchTerm serverInfo:serverInfo 
completionHandler:handler];
+                return nil;
             }
         } else {
             pubs = [BDSKEntrezGroupServer itemsForSearchTerm:searchTerm 
usingDatabase:@"pubmed" allowMultiple:YES];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit