From 8cbd318cca6f457502f381fdc3339b760eb8954a Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Tue, 19 Sep 2023 10:27:49 +1000
Subject: [PATCH] Fixed an issue where the conversation screen was dismissed
 incorrectly

Fixed a bug where going to the settings screen in a conversation with no messages would pop to the conversation list
---
 Session/Conversations/ConversationVC.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index e6e60e648..8cce3fe0a 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -569,6 +569,10 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
         let threadId: String = viewModel.threadData.threadId
         
         if
+            (
+                self.navigationController == nil ||
+                self.navigationController?.viewControllers.contains(self) == false
+            ) &&
             viewModel.threadData.threadIsNoteToSelf == false &&
             viewModel.threadData.threadShouldBeVisible == false &&
             !SessionUtil.conversationInConfig(