From 2999b5d66559817e57f52be5e02f9cd859da8cc0 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Thu, 4 Feb 2021 12:26:51 +0100
Subject: Fix redirect when deleting current conversation

When the current conversation was deleted while in a call, or
whenever someone has been removed from a room, the redirect
now targets the not-found page instead of the one about duplicate
session.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 src/PublicShareSidebar.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/PublicShareSidebar.vue')

diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index 7ec30e1cc..621413a13 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -58,7 +58,7 @@ import {
 } from './services/participantsService'
 import { signalingKill } from './utils/webrtc/index'
 import browserCheck from './mixins/browserCheck'
-import duplicateSessionHandler from './mixins/duplicateSessionHandler'
+import sessionIssueHandler from './mixins/sessionIssueHandler'
 import isInCall from './mixins/isInCall'
 import participant from './mixins/participant'
 import talkHashCheck from './mixins/talkHashCheck'
@@ -77,7 +77,7 @@ export default {
 
 	mixins: [
 		browserCheck,
-		duplicateSessionHandler,
+		sessionIssueHandler,
 		isInCall,
 		participant,
 		talkHashCheck,
@@ -116,7 +116,7 @@ export default {
 		},
 
 		warnLeaving() {
-			return !this.isLeavingAfterSessionConflict && this.isInCall
+			return !this.isLeavingAfterSessionIssue && this.isInCall
 		},
 	},
 
@@ -126,7 +126,7 @@ export default {
 				// We have to do this synchronously, because in unload and beforeunload
 				// Promises, async and await are prohibited.
 				signalingKill()
-				if (!this.isLeavingAfterSessionConflict) {
+				if (!this.isLeavingAfterSessionIssue) {
 					leaveConversationSync(this.token)
 				}
 			}
-- 
cgit v1.2.3

