fix: clear autobackup/pull correctly

denolehov · Dec 6, 2021 · 1c5eeab · 1c5eeab
1 parent d5f1480
commit 1c5eeab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -380,11 +380,13 @@ export default class ObsidianGit extends Plugin {
         let wasActive = false;
         if (this.timeoutIDBackup) {
             window.clearTimeout(this.timeoutIDBackup);
+            this.timeoutIDBackup = undefined;
             wasActive = true;
         }
         if (this.onFileModifyEventRef) {
             this.autoBackupDebouncer?.cancel();
             this.app.vault.offref(this.onFileModifyEventRef);
+            this.onFileModifyEventRef = undefined;
             wasActive = true;
         }
         return wasActive;
@@ -393,11 +395,13 @@ export default class ObsidianGit extends Plugin {
     clearAutoPull(): boolean {
         if (this.timeoutIDPull) {
             window.clearTimeout(this.timeoutIDPull);
+            this.timeoutIDPull = undefined;
             return true;
         }
         return false;
     }
 
+
     async handleConflict(conflicted: string[]): Promise<void> {
         this.setState(PluginState.conflicted);
         const lines = [

diff --git a/src/settings.ts b/src/settings.ts
@@ -28,10 +28,7 @@ export class ObsidianGitSettingsTab extends PluginSettingTab {
                                 new Notice(
                                     `Automatic backup enabled! Every ${plugin.settings.autoSaveInterval} minutes.`
                                 );
-                            } else if (
-                                plugin.settings.autoSaveInterval <= 0 &&
-                                plugin.timeoutIDBackup
-                            ) {
+                            } else if (plugin.settings.autoSaveInterval <= 0) {
                                 plugin.clearAutoBackup() &&
                                     new Notice("Automatic backup disabled!");
                             }
@@ -72,8 +69,7 @@ export class ObsidianGitSettingsTab extends PluginSettingTab {
                                     `Automatic pull enabled! Every ${plugin.settings.autoPullInterval} minutes.`
                                 );
                             } else if (
-                                plugin.settings.autoPullInterval <= 0 &&
-                                plugin.timeoutIDPull
+                                plugin.settings.autoPullInterval <= 0
                             ) {
                                 plugin.clearAutoPull() &&
                                     new Notice("Automatic pull disabled!");