phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-39209] Check that Channels isn't redirecting to / to prevent a refresh (#1807)

Browse Source
This commit is contained in:
Devin Binnie
2021-10-14 09:25:21 -04:00
committed by GitHub
parent 5e104ab335
commit cc4ddc3c18
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/windows/windowManager.ts
View File

@@ -21,7 +21,7 @@ import {
} from 'common/communication'; } from 'common/communication';
import urlUtils from 'common/utils/url'; import urlUtils from 'common/utils/url';
import {getTabViewName} from 'common/tabs/TabView'; import {getTabViewName, TAB_MESSAGING} from 'common/tabs/TabView';
import {getAdjustedWindowBoundaries} from '../utils'; import {getAdjustedWindowBoundaries} from '../utils';
@@ -565,7 +565,11 @@ function handleBrowserHistoryPush(e: IpcMainEvent, viewName: string, pathName: s
log.info('redirecting to a new view', redirectedView?.name || viewName); log.info('redirecting to a new view', redirectedView?.name || viewName);
status.viewManager?.showByName(redirectedView?.name || viewName); status.viewManager?.showByName(redirectedView?.name || viewName);
} }
redirectedView?.view.webContents.send(BROWSER_HISTORY_PUSH, pathName);
// Special case check for Channels to not force a redirect to "/", causing a refresh
if (!(redirectedView !== currentView && redirectedView?.tab.type === TAB_MESSAGING && pathName === '/')) {
redirectedView?.view.webContents.send(BROWSER_HISTORY_PUSH, pathName);
}
} }
export function getCurrentTeamName() { export function getCurrentTeamName() {