This makes the SubtitleDialog remember the last service used, and als…

…o the last search instead of always using, and searching, the first service in the list.
xbmc · Jun 21, 2016 · 17525c5 · 17525c5
1 parent 7b8e691
commit 17525c5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -143,6 +143,7 @@
 
 // Dialog includes
 #include "video/dialogs/GUIDialogVideoBookmarks.h"
+#include "video/dialogs/GUIDialogSubtitles.h"
 #include "dialogs/GUIDialogOK.h"
 #include "dialogs/GUIDialogKaiToast.h"
 #include "dialogs/GUIDialogSubMenu.h"
@@ -3795,6 +3796,12 @@ void CApplication::StopPlaying()
   {
     m_pPlayer->CloseFile();
 
+    // When playback stops we must clear the saved subtitle search from the SubtitleDialog since the dialog is preserved in memory
+    // Otherwise the next time the dialogs open any previous search from a previous movie will be shown
+    CGUIDialogSubtitles *dialog = (CGUIDialogSubtitles*)g_windowManager.GetWindow(WINDOW_DIALOG_SUBTITLES);
+    CGUIMessage msg(GUI_MSG_WINDOW_RESET, dialog->GetID(), 0);
+    dialog->OnMessage(msg);
+
     // turn off visualisation window when stopping
     if ((iWin == WINDOW_VISUALISATION
     ||  iWin == WINDOW_FULLSCREEN_VIDEO)

diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
@@ -162,8 +162,14 @@ bool CGUIDialogSubtitles::OnMessage(CGUIMessage& message)
 
     CGUIDialog::OnMessage(message);
 
+    return true;
+  }
+  else if (message.GetMessage() == GUI_MSG_WINDOW_RESET)
+  {
+    CGUIDialog::OnMessage(message);
+
+    // Clear saved subtitles from any previous subtitle search
     ClearSubtitles();
-    ClearServices();
     return true;
   }
   return CGUIDialog::OnMessage(message);
@@ -181,7 +187,10 @@ void CGUIDialogSubtitles::OnInitWindow()
 
   FillServices();
   CGUIWindow::OnInitWindow();
-  Search();
+
+  // Only do a inital search for subtitles if there isn't a saved search
+  if (m_subtitles->IsEmpty())
+    Search();
 }
 
 void CGUIDialogSubtitles::Process(unsigned int currentTime, CDirtyRegionList &dirtyregions)
@@ -231,6 +240,7 @@ void CGUIDialogSubtitles::Process(unsigned int currentTime, CDirtyRegionList &di
 
 void CGUIDialogSubtitles::FillServices()
 {
+  std::string previousService = m_currentService;
   ClearServices();
 
   VECADDONS addons;
@@ -257,7 +267,8 @@ void CGUIDialogSubtitles::FillServices()
   {
     CFileItemPtr item(CAddonsDirectory::FileItemFromAddon(*addonIt, "plugin://" + (*addonIt)->ID(), false));
     m_serviceItems->Add(item);
-    if ((*addonIt)->ID() == defaultService)
+    // If we don't have used a previous service use the default service, otherwise use the previous service
+    if ((previousService.empty() && (*addonIt)->ID() == defaultService) || (*addonIt)->ID() == previousService)
       service = (*addonIt)->ID();
   }