Use getProfileOrNull instead of getProfile in getProfilesFromRawUrl

m1rp · Jul 19, 2019 · 289a64b · 289a64b
1 parent adcdca9
commit 289a64b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/actions/receive-profile.js b/src/actions/receive-profile.js
@@ -40,7 +40,7 @@ import {
   initializeHiddenGlobalTracks,
   getVisibleThreads,
 } from '../profile-logic/tracks';
-import { getProfile, getProfileOrNull } from '../selectors/profile';
+import { getProfileOrNull } from '../selectors/profile';
 import { getView } from '../selectors/app';
 import { setDataSource } from './profile-view';
 
@@ -997,7 +997,7 @@ export function retrieveProfilesToCompare(
 export function getProfilesFromRawUrl(
   location: Location
 ): ThunkAction<
-  Promise<{| profile: Profile, shouldSetupInitialUrlState: boolean |}>
+  Promise<{| profile: Profile | null, shouldSetupInitialUrlState: boolean |}>
 > {
   return async (dispatch, getState) => {
     const pathParts = location.pathname.split('/').filter(d => d);
@@ -1049,7 +1049,7 @@ export function getProfilesFromRawUrl(
     }
 
     return {
-      profile: getProfile(getState()),
+      profile: getProfileOrNull(getState()),
       shouldSetupInitialUrlState,
     };
   };

diff --git a/src/components/app/UrlManager.js b/src/components/app/UrlManager.js
@@ -97,15 +97,15 @@ class UrlManager extends React.PureComponent<Props> {
     try {
       // Process the raw url and fetch the profile.
       const results: {
-        profile: Profile,
+        profile: Profile | null,
         shouldSetupInitialUrlState: boolean,
       } = await getProfilesFromRawUrl(window.location);
 
       // Manually coerce these into the proper type due to the FlowFixMe above.
-      const profile: Profile = results.profile;
+      const profile: Profile | null = results.profile;
       const shouldSetupInitialUrlState: boolean =
         results.shouldSetupInitialUrlState;
-      if (shouldSetupInitialUrlState) {
+      if (profile !== null && shouldSetupInitialUrlState) {
         setupInitialUrlState(window.location, profile);
       } else {
         urlSetupDone();