haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app: avoid loading config when going back to the welcome page

This commit is contained in:
Saúl Ibarra Corretgé 2019-05-23 10:17:42 +02:00 committed by Saúl Ibarra Corretgé
parent a4cf79c161
commit a2f8e156da
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
react/features/app/actions.js
View File

@ -81,16 +81,23 @@ export function appNavigate(uri: ?string) {
let config;
try {
config = await loadConfig(url);
dispatch(storeConfig(baseURL, config));
} catch (error) {
// Avoid (re)loading the config when there is no room.
if (!room) {
config = restoreConfig(baseURL);
}
if (!config) {
dispatch(loadConfigError(error, locationURL));
if (!config) {
try {
config = await loadConfig(url);
dispatch(storeConfig(baseURL, config));
} catch (error) {
config = restoreConfig(baseURL);
return;
if (!config) {
dispatch(loadConfigError(error, locationURL));
return;
}
}
}