merged with master again

1 files changed, 5 insertions, 8 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 296574a04..be62de1d6 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -256,7 +256,10 @@ export class MainView extends React.Component {
     initAuthenticationRouters = async () => {
         // Load the user's active workspace, or create a new one if initial session after signup
         let received = CurrentUserUtils.MainDocId;
-        if (received) {
+        let doc: Opt<Doc>;
+        if (this.userDoc && (doc = await Cast(this.userDoc.activeWorkspace, Doc))) {
+            this.openWorkspace(doc);
+        } else if (received) {
             if (!this.userDoc) {
                 reaction(
                     () => CurrentUserUtils.GuestTarget,
@@ -282,12 +285,6 @@ export class MainView extends React.Component {
                         },
                     );
                 }
-                let doc: Opt<Doc>;
-                if (this.userDoc && (doc = await Cast(this.userDoc.activeWorkspace, Doc))) {
-                    this.openWorkspace(doc);
-                } else {
-                    this.createNewWorkspace();
-                }
             } else {
                 DocServer.GetRefField(received).then(field => {
                     field instanceof Doc ? this.openWorkspace(field) :
@@ -661,7 +658,7 @@ export class MainView extends React.Component {
         let next = () => PresBox.CurrentPresentation.next();
         let back = () => PresBox.CurrentPresentation.back();
         let startOrResetPres = () => PresBox.CurrentPresentation.startOrResetPres();
-        let closePresMode = action(() => { PresBox.CurrentPresentation.presMode = false; this.addDocTabFunc(PresBox.CurrentPresentation.props.Document, undefined, "close"); });
+        let closePresMode = action(() => { PresBox.CurrentPresentation.presMode = false; this.addDocTabFunc(PresBox.CurrentPresentation.props.Document, undefined, "onRight"); });
         return !PresBox.CurrentPresentation || !PresBox.CurrentPresentation.presMode ? (null) : <PresModeMenu next={next} back={back} presStatus={PresBox.CurrentPresentation.presStatus} startOrResetPres={startOrResetPres} closePresMode={closePresMode} > </PresModeMenu>;
     }