fix: profile deletion

Voxelum · Sep 1, 2019 · 9862d49 · 9862d49
1 parent 003d10f
commit 9862d49
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/store/modules/profile.js b/src/main/store/modules/profile.js
@@ -399,6 +399,10 @@ const mod = {
         },
 
         async deleteProfile(context, id = context.state.id) {
+            if (typeof id !== 'string') {
+                console.error(`Invalid contract! Should pass profile id to delete profile. Get ${id}`);
+                return;
+            }
             if (context.state.id === id) {
                 const allIds = Object.keys(context.state.all);
                 if (allIds.length === 1) {
@@ -408,7 +412,10 @@ const mod = {
                 }
             }
             context.commit('removeProfile', id);
-            await fs.remove(context.rootGetters.path('profiles', id));
+            const profileDir = context.rootGetters.path('profiles', id);
+            if (await fs.exists(profileDir)) {
+                await fs.remove(profileDir);
+            }
         },
 
 

diff --git a/src/renderer/windows/main/ProfilesPage.vue b/src/renderer/windows/main/ProfilesPage.vue
@@ -225,7 +225,14 @@ export default {
       });
     },
     doDelete() {
-      this.$repo.dispatch('deleteProfile', this.deletingProfile);
+      if (this.deletingProfile) {
+        this.$repo.dispatch('deleteProfile', this.deletingProfile.id)
+          .finally(() => {
+            this.isDeletingProfile = false;
+          });
+      } else {
+            this.isDeletingProfile = false;
+      }
     },
     cancelDelete() {
       this.isDeletingProfile = false;