Removed MarkerView's subscription on NavigationRequestBlockedEvent

Bible-Translation-Tools · Jun 3, 2024 · 23ac72d · 23ac72d
1 parent c13597c
commit 23ac72d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/...rkerapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/markerapp/app/view/MarkerView.kt b/...rkerapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/markerapp/app/view/MarkerView.kt
@@ -63,17 +63,12 @@ class MarkerView : PluginEntrypoint() {
         tryImportStylesheet(resources["/css/verse-marker-app.css"])
         tryImportStylesheet(resources["/css/scrolling-waveform.css"])
         tryImportStylesheet(resources["/css/chunk-marker.css"])
-
+        
         subscribe<PluginCloseRequestEvent> {
             unsubscribe()
             viewModel.saveAndQuit()
         }
 
-        subscribe<NavigationRequestBlockedEvent> {
-            unsubscribe()
-            viewModel.saveAndQuit()
-        }
-
         subscribe<MarkerMovedEvent> {
             viewModel.moveMarker(it.markerId, it.start, it.end)
         }

diff --git a/...in/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/narration/NarrationViewModel.kt b/...in/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/narration/NarrationViewModel.kt
@@ -71,6 +71,7 @@ import org.wycliffeassociates.otter.jvm.workbookapp.ui.narration.waveform.Narrat
 import org.wycliffeassociates.otter.jvm.workbookapp.ui.viewmodel.AppPreferencesStore
 import org.wycliffeassociates.otter.jvm.workbookapp.ui.viewmodel.AudioPluginViewModel
 import org.wycliffeassociates.otter.jvm.workbookapp.ui.viewmodel.WorkbookDataStore
+import org.wycliffeassociates.otter.jvm.workbookplugin.plugin.PluginCloseRequestEvent
 import tornadofx.*
 import java.io.File
 import java.text.MessageFormat
@@ -179,6 +180,7 @@ class NarrationViewModel : ViewModel() {
                 }
             } else if (pluginOpenedProperty.value) {
                 navigator.navigateHomeOnPluginClosed = true
+                fire(PluginCloseRequestEvent)
             }
         }