* Fully enable export of favorite groups

* Favorites can now be imported, sorted even if "Quick Connect" is selected
* Favorite files containing groups will now be imported correctly
* If a favorite and the group containing said favorite are exported, the favorite will no longer be included twice

1 files changed, 3 insertions, 2 deletions

diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 25049d44..d7fce6fb 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -51,6 +51,7 @@
 #import "SPFavoritesImporter.h"
 #import "SPThreadAdditions.h"
 #import "SPFavoriteColorSupport.h"
+#import "SPNamedNode.h"
 
 #import <SPMySQL/SPMySQL.h>
 
@@ -738,7 +739,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
 {
 	SPTreeNode *node = [self selectedFavoriteNode];
 	
-	return (![node isGroup]) ? [[node representedObject] nodeFavorite] : nil;
+	return (![node isGroup]) ? [(SPFavoriteNode *)[node representedObject] nodeFavorite] : nil;
 }
 
 /**
@@ -1045,7 +1046,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
 	NSSavePanel *savePanel = [NSSavePanel savePanel];
 	
 	// suggest the name of the favorite or a default name for multiple selection
-	NSString *fileName = ([[self selectedFavoriteNodes] count] == 1)? [[[self selectedFavorite] objectForKey:SPFavoriteNameKey] stringByAppendingPathExtension:@"plist"] : nil;
+	NSString *fileName = ([[self selectedFavoriteNodes] count] == 1)? [[(id<SPNamedNode>)[[self selectedFavoriteNode] representedObject] nodeName] stringByAppendingPathExtension:@"plist"] : nil;
 	// This if() is so we can also catch nil due to favorite corruption (NSSavePanel will @throw if nil is passed in)
 	if(!fileName)
 		fileName = SPExportFavoritesFilename;