Merge branch 'master' into cwhitten/channels-update

microsoft · May 2, 2019 · 6ad85d8 · 6ad85d8
2 parents 7f20391 + f0807da
commit 6ad85d8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/app/main/src/commands/botCommands.ts b/packages/app/main/src/commands/botCommands.ts
@@ -108,7 +108,10 @@ export function registerCommands(commandRegistry: CommandRegistryImpl) {
     Bot.Open,
     async (botPath: string, secret?: string): Promise<BotConfigWithPath> => {
       // Make sure we're not in Sidecar debug mode
-      getSettingsStore().dispatch(debugModeChanged(DebugMode.Normal));
+      const settingsStore = getSettingsStore();
+      if (settingsStore.getState().windowState.debugMode !== DebugMode.Normal) {
+        getSettingsStore().dispatch(debugModeChanged(DebugMode.Normal));
+      }
       // try to get the bot secret from bots.json
       const botInfo = pathExistsInRecentBots(botPath) ? getBotInfoByPath(botPath) : null;
       if (botInfo) {