From b23b404f687746fa51005c38435e3e7b6f8d01b0 Mon Sep 17 00:00:00 2001
From: evandrocoan <evandrocoan@hotmail.com>
Date: Mon, 1 Jun 2020 12:47:46 -0300
Subject: [PATCH] Created the profiles.py session attribute for things to
 forgot

each time Anki restarted and set to only fill the find and replace
dialogs when they were filled on the actual session.
---
 qt/aqt/profiles.py |  2 ++
 qt/aqt/utils.py    | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py
index 9fc13a0bd..8ca096c3f 100644
--- a/qt/aqt/profiles.py
+++ b/qt/aqt/profiles.py
@@ -76,6 +76,8 @@ class AnkiRestart(SystemExit):
 
 class ProfileManager:
     def __init__(self, base=None):
+        ## Settings which should be forgotten each Anki restart
+        self.session = {}
         self.name = None
         self.db = None
         self.profile: Optional[Dict] = None
diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py
index 03e4943f5..d1f0afe92 100644
--- a/qt/aqt/utils.py
+++ b/qt/aqt/utils.py
@@ -484,15 +484,15 @@ def restoreIsChecked(widget, key: str):
 def saveComboIndex(widget: QComboBox, key: str):
     textKey = key + "ComboActiveText"
     indexKey = key + "ComboActiveIndex"
-    aqt.mw.pm.profile[textKey] = widget.currentText()
-    aqt.mw.pm.profile[indexKey] = widget.currentIndex()
+    aqt.mw.pm.session[textKey] = widget.currentText()
+    aqt.mw.pm.session[indexKey] = widget.currentIndex()
 
 
 def restoreComboIndex(widget: QComboBox, history: List[str], key: str):
     textKey = key + "ComboActiveText"
     indexKey = key + "ComboActiveIndex"
-    text = aqt.mw.pm.profile.get(textKey)
-    index = aqt.mw.pm.profile.get(indexKey)
+    text = aqt.mw.pm.session.get(textKey)
+    index = aqt.mw.pm.session.get(indexKey)
     if text is not None and index is not None:
         if index < len(history) and history[index] == text:
             widget.setCurrentIndex(index)
@@ -507,6 +507,7 @@ def saveComboHistory(comboBox: QComboBox, history: List[str], name: str):
     history = history[:50]
     comboBox.clear()
     comboBox.addItems(history)
+    aqt.mw.pm.session[name] = text_input
     aqt.mw.pm.profile[name] = history
     return text_input
 
@@ -514,9 +515,12 @@ def saveComboHistory(comboBox: QComboBox, history: List[str], name: str):
 def restoreComboHistory(comboBox: QComboBox, name: str):
     name += "BoxHistory"
     history = aqt.mw.pm.profile.get(name, [])
-    comboBox.addItems(history)
-    comboBox.lineEdit().setText(history[0] if history else "")
-    comboBox.lineEdit().selectAll()
+    comboBox.addItems([""] + history)
+    if history:
+        session_input = aqt.mw.pm.session.get(name)
+        if session_input and session_input == history[0]:
+            comboBox.lineEdit().setText(session_input)
+            comboBox.lineEdit().selectAll()
     return history