From bf4cca631c04fa09a5a3081278aeca6b22e4f1d2 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Wed, 9 Mar 2022 14:32:21 -0800
Subject: [PATCH] Properly remove bad profile dir

---
 app/app.go      | 2 +-
 peer/storage.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/app.go b/app/app.go
index b9947ff..bd89143 100644
--- a/app/app.go
+++ b/app/app.go
@@ -129,7 +129,7 @@ func (app *application) AddPeerPlugin(onion string, pluginID plugins.PluginID) {
 func (app *application) ImportProfile(exportedCwtchFile string, password string) (peer.CwtchPeer, error) {
 	profileDirectory := path.Join(app.directory, "profiles")
 	profile, err := peer.ImportProfile(exportedCwtchFile, profileDirectory, password)
-	if err == nil {
+	if profile != nil || err == nil {
 		app.installProfile(profile)
 	}
 	return profile, err
diff --git a/peer/storage.go b/peer/storage.go
index 89bcf76..57120ba 100644
--- a/peer/storage.go
+++ b/peer/storage.go
@@ -191,7 +191,8 @@ func ImportProfile(exportedCwtchFile string, profilesDir string, password string
 				return profile, err
 			}
 			//  Otherwise purge
-			os.RemoveAll(filepath.Join(profilesDir, profileDir))
+			log.Errorf("error importing profile: %v. removing %s", err, profileDir)
+			os.RemoveAll(profileDir)
 			return nil, err
 		}
 		return nil, err