mirror of
https://github.com/Equicord/Equicord.git
synced 2025-02-25 17:48:52 -05:00
Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
f29c7900fe
1 changed files with 9 additions and 1 deletions
|
@ -173,6 +173,15 @@ export default definePlugin({
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
CrashHandlerLogger.debug("Failed to pop all layers.", err);
|
CrashHandlerLogger.debug("Failed to pop all layers.", err);
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
FluxDispatcher.dispatch({
|
||||||
|
type: "DEV_TOOLS_SETTINGS_UPDATE",
|
||||||
|
settings: { displayTools: false, lastOpenTabId: "analytics" }
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to close DevTools.", err);
|
||||||
|
}
|
||||||
|
|
||||||
if (settings.store.attemptToNavigateToHome) {
|
if (settings.store.attemptToNavigateToHome) {
|
||||||
try {
|
try {
|
||||||
NavigationRouter.transitionToGuild("@me");
|
NavigationRouter.transitionToGuild("@me");
|
||||||
|
@ -181,7 +190,6 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set isRecovering to false before setting the state to allow us to handle the next crash error correcty, in case it happens
|
// Set isRecovering to false before setting the state to allow us to handle the next crash error correcty, in case it happens
|
||||||
setImmediate(() => isRecovering = false);
|
setImmediate(() => isRecovering = false);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue