core fix cancelAllDialogs

jarvify · Sep 26, 2019 · c30c844 · c30c844
1 parent 22cd670
commit c30c844
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/botkit/src/core.ts b/packages/botkit/src/core.ts
@@ -777,14 +777,14 @@ export class Botkit {
     public async saveState(bot: BotWorker, force = false): Promise<void> {
         try {
             const context = bot.getConfig('context');
+            const dialogContext = bot.getConfig('dialogContext');
 
-            if (force) {
+            if (force || dialogContext.stack.length === 0) {
                 await this.conversationState.saveChanges(context);
                 return;
             }
 
             const activity = bot.getConfig('activity');
-            const dialogContext = bot.getConfig('dialogContext');
 
             const turnContextAfter = new TurnContext(this.adapter, activity);
             const dialogContextAfter = await this.dialogSet.createContext(turnContextAfter);
@@ -795,7 +795,6 @@ export class Botkit {
                 instanceIdAfter = dialogContextAfter.stack[0].state.values.instanceId;
             }
 
-            // @ts-ignore
             let instanceIdBefore = dialogContext.stack[0].state.values.instanceId;
             if (instanceIdBefore !== instanceIdAfter) {
                 await this.conversationState.saveChanges(context);