From 093a08836312ca45b0092e2933ee117d664a4144 Mon Sep 17 00:00:00 2001
From: James Upjohn <jammehcow@jammehcow.co.nz>
Date: Sun, 28 Mar 2021 00:32:14 +1300
Subject: [PATCH] Fix quick switcher not ordering based on tab order (#2561)

---
 CHANGELOG.md                                        | 1 +
 src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05b2312b1..d9f83d306 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,7 @@
 - Bugfix: Fix Twitch cheer emotes not displaying tooltips when hovered (#2434, #2503)
 - Bugfix: Fix BTTV/FFZ channel emotes saying unknown error when no emotes found (#2542)
 - Bugfix: Fix directory not opening when clicking "Open AppData Directory" setting button on macOS (#2531, #2537)
+- Bugfix: Fix quickswitcher not respecting order of tabs when filtering (#2519, #2561)
 - Dev: Updated minimum required Qt framework version to 5.12. (#2210)
 - Dev: Migrated `Kraken::getUser` to Helix (#2260)
 - Dev: Migrated `TwitchAccount::(un)followUser` from Kraken to Helix and moved it to `Helix::(un)followUser`. (#2306)
diff --git a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp
index f5b2dc743..9a8fe08ca 100644
--- a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp
+++ b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp
@@ -14,14 +14,14 @@
 namespace chatterino {
 
 namespace {
-    QSet<SplitContainer *> openPages()
+    QList<SplitContainer *> openPages()
     {
-        QSet<SplitContainer *> pages;
+        QList<SplitContainer *> pages;
 
         auto &nb = getApp()->windows->getMainWindow().getNotebook();
         for (int i = 0; i < nb.getPageCount(); ++i)
         {
-            pages.insert(static_cast<SplitContainer *>(nb.getPageAt(i)));
+            pages.append(static_cast<SplitContainer *>(nb.getPageAt(i)));
         }
 
         return pages;