fix: properly disable auto pull

close #816
Vinzent03 · Nov 24, 2024 · f8464e6 · f8464e6
1 parent 1a788b0
commit f8464e6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -426,6 +426,7 @@ export default class ObsidianGit extends Plugin {
         this.branchBar?.remove();
         this.statusBar?.remove();
         this.gitManager.unload();
+        this.promiseQueue.clear();
 
         for (const interval of this.intervalsToClear) {
             window.clearInterval(interval);
@@ -664,7 +665,7 @@ export default class ObsidianGit extends Plugin {
             return;
         }
         if (!filesUpdated) {
-            this.displayMessage("Everything is up-to-date");
+            this.displayMessage("Pull: Everything is up-to-date");
         }
 
         if (this.gitManager instanceof SimpleGit) {

diff --git a/src/promiseQueue.ts b/src/promiseQueue.ts
@@ -22,4 +22,8 @@ export class PromiseQueue {
                 });
         }
     }
+
+    clear() {
+        this.tasks = [];
+    }
 }
diff --git a/src/setting/settings.ts b/src/setting/settings.ts
@@ -180,8 +180,8 @@ export class ObsidianGitSettingsTab extends PluginSettingTab {
                                     Number(value);
                                 await plugin.saveSettings();
 
+                                plugin.automaticsManager.reload("push");
                                 if (plugin.settings.autoPushInterval > 0) {
-                                    plugin.automaticsManager.reload("push");
                                     new Notice(
                                         `Automatic push enabled! Every ${formatMinutes(
                                             plugin.settings.autoPushInterval
@@ -216,8 +216,8 @@ export class ObsidianGitSettingsTab extends PluginSettingTab {
                                     Number(value);
                                 await plugin.saveSettings();
 
+                                plugin.automaticsManager.reload("pull");
                                 if (plugin.settings.autoPullInterval > 0) {
-                                    plugin.automaticsManager.reload("pull");
                                     new Notice(
                                         `Automatic pull enabled! Every ${formatMinutes(
                                             plugin.settings.autoPullInterval
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,8 @@ export class PromiseQueue { @@
                     });
             }
         }
+        clear() {
+            this.tasks = [];
+        }
     }