From 74ac6998413a5911b95195c18bb66d36e0dbc833 Mon Sep 17 00:00:00 2001
From: Anch <adrianpratt.ap@gmail.com>
Date: Wed, 3 Aug 2022 21:45:53 +1200
Subject: [PATCH] merg

---
 AtlasLoot/Core/SearchAdvanced.lua                | 1 +
 AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/AtlasLoot/Core/SearchAdvanced.lua b/AtlasLoot/Core/SearchAdvanced.lua
index a839687..02619b0 100644
--- a/AtlasLoot/Core/SearchAdvanced.lua
+++ b/AtlasLoot/Core/SearchAdvanced.lua
@@ -243,6 +243,7 @@ function AtlasLoot_AdvancedSearchClose()
     AtlasLootDefaultFrame_AdvancedSearchPanel:Hide();
 
     if (SearchPrevData[1] ~= "") then
+        AtlasLootDefaultFrame_SubTableScrollFrameUpdate(SearchPrevData[1], SearchPrevData[2], SearchPrevData[4], SearchPrevData[5]);
         AtlasLoot_ShowItemsFrame(SearchPrevData[1], SearchPrevData[2], SearchPrevData[3], SearchPrevData[4], SearchPrevData[5]);
     end
 end
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
index dd76253..6cf1a17 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
@@ -292,15 +292,12 @@ function AtlasLoot_SetNewStyle(style)
 		"AtlasLootDefaultFrameLastResultButton",
 		"AtlasLootDefaultFrameWishListButton",
         "AtlasLootDefaultFrameAdvancedSearchButton",
-<<<<<<< Updated upstream
         "AtlasLootDefaultFrame_AdvancedSearchPanel_EquipButton",
         "AtlasLootDefaultFrame_AdvancedSearchPanel_EquipSubButton",
         "AtlasLootDefaultFrame_AdvancedSearchPanel_QualityButton",
         "AtlasLootDefaultFrame_AdvancedSearchPanel_SearchButton",
         "AtlasLootDefaultFrame_AdvancedSearchPanel_ClearButton",
-=======
         "AtlasLootDefaultFrame_MapButton",
->>>>>>> Stashed changes
 	}
 
 	if style == "new" then