From 61e99ea47650e776c0fb94084b3453c73ed1adfc Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Tue, 9 Apr 2019 13:04:26 -0500
Subject: [PATCH] Fixes #1496: Crash adding bookmark folder

---
 .../addfolder/AddBookmarkFolderFragment.kt    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt
index b14f1114e3..c5e779750a 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt
@@ -59,13 +59,18 @@ class AddBookmarkFolderFragment : Fragment(), CoroutineScope {
         launch(IO) {
             sharedViewModel.selectedFolder = sharedViewModel.selectedFolder
                 ?: requireComponents.core.bookmarksStorage.getTree(BookmarkRoot.Mobile.id)
-            bookmark_add_folder_parent_selector.text = sharedViewModel.selectedFolder!!.title
-            bookmark_add_folder_parent_selector.setOnClickListener {
-                Navigation.findNavController(requireActivity(), R.id.container)
-                    .navigate(
-                        AddBookmarkFolderFragmentDirections
-                            .actionBookmarkAddFolderFragmentToBookmarkSelectFolderFragment(BookmarkRoot.Root.id, true)
-                    )
+            launch(Main) {
+                bookmark_add_folder_parent_selector.text = sharedViewModel.selectedFolder!!.title
+                bookmark_add_folder_parent_selector.setOnClickListener {
+                    Navigation.findNavController(requireActivity(), R.id.container)
+                        .navigate(
+                            AddBookmarkFolderFragmentDirections
+                                .actionBookmarkAddFolderFragmentToBookmarkSelectFolderFragment(
+                                    BookmarkRoot.Root.id,
+                                    true
+                                )
+                        )
+                }
             }
         }
     }