From cbbc2d191d2e7d24dd31d8ac451da387836814d8 Mon Sep 17 00:00:00 2001 From: Tannin Date: Sat, 21 Mar 2015 16:30:43 +0100 Subject: bugfix: crash when entering search terms for the mod list --- src/modlistsortproxy.cpp | 8 +++----- src/modlistsortproxy.h | 4 ---- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp index 56783132..d649996f 100644 --- a/src/modlistsortproxy.cpp +++ b/src/modlistsortproxy.cpp @@ -37,7 +37,6 @@ ModListSortProxy::ModListSortProxy(Profile* profile, QObject *parent) , m_CurrentFilter() , m_FilterActive(false) , m_FilterMode(FILTER_AND) - , m_BeingInvalidated(false) { m_EnabledColumns.set(ModList::COL_FLAGS); m_EnabledColumns.set(ModList::COL_NAME); @@ -198,10 +197,9 @@ void ModListSortProxy::updateFilter(const QString &filter) { m_CurrentFilter = filter; updateFilterActive(); - // workaround because qt throws a fit if, as a result of this invalidation, another invalidate is called - m_BeingInvalidated = true; - invalidateFilter(); - m_BeingInvalidated = false; + // using invalidateFilter here should be enough but that crashes the application? WTF? + // invalidateFilter(); + invalidate(); } bool ModListSortProxy::hasConflictFlag(const std::vector &flags) const diff --git a/src/modlistsortproxy.h b/src/modlistsortproxy.h index 05392c0b..35c60235 100644 --- a/src/modlistsortproxy.h +++ b/src/modlistsortproxy.h @@ -91,8 +91,6 @@ public: return rowCount(parent) > 0; } - bool beingInvalidated() const { return m_BeingInvalidated; } - public slots: void updateFilter(const QString &filter); @@ -125,8 +123,6 @@ private: bool m_FilterActive; FilterMode m_FilterMode; - bool m_BeingInvalidated; - }; #endif // MODLISTSORTPROXY_H -- cgit v1.3.1