From 065318eb395841b72fbd20276bdf6b12e3327bbb Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Wed, 25 Jul 2018 08:44:17 -0400 Subject: [PATCH] Qt: set default limit for "all playlists" to 5000, use retro_assert instead of assert --- ui/drivers/qt/ui_qt_window.cpp | 2 +- ui/drivers/ui_qt.cpp | 2 +- ui/drivers/ui_qt.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp index d8c55aaf39..7c3941076e 100644 --- a/ui/drivers/qt/ui_qt_window.cpp +++ b/ui/drivers/qt/ui_qt_window.cpp @@ -385,7 +385,7 @@ void ViewOptionsDialog::loadViewOptions() m_saveLastTabCheckBox->setChecked(m_settings->value("save_last_tab", false).toBool()); m_showHiddenFilesCheckBox->setChecked(m_settings->value("show_hidden_files", true).toBool()); m_suggestLoadedCoreFirstCheckBox->setChecked(m_settings->value("suggest_loaded_core_first", false).toBool()); - m_allPlaylistsMaxCountSpinBox->setValue(m_settings->value("all_playlists_max_count", 0).toInt()); + m_allPlaylistsMaxCountSpinBox->setValue(m_settings->value("all_playlists_max_count", 5000).toInt()); themeIndex = m_themeComboBox->findData(m_mainwindow->getThemeFromString(m_settings->value("theme", "default").toString())); diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 909058cc63..fcdfd23685 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -477,7 +477,7 @@ static void* ui_companion_qt_init(void) mainwindow->resizeThumbnails(true, true, true); if (qsettings->contains("all_playlists_max_count")) - mainwindow->setAllPlaylistsMaxCount(qsettings->value("all_playlists_max_count", 0).toInt()); + mainwindow->setAllPlaylistsMaxCount(qsettings->value("all_playlists_max_count", 5000).toInt()); if (qsettings->contains("geometry")) if (qsettings->contains("save_geometry")) diff --git a/ui/drivers/ui_qt.h b/ui/drivers/ui_qt.h index 9e4f568732..552dd21473 100644 --- a/ui/drivers/ui_qt.h +++ b/ui/drivers/ui_qt.h @@ -89,7 +89,7 @@ class ThumbnailWidget : public QFrame Q_OBJECT public: ThumbnailWidget(QWidget *parent = 0); - ThumbnailWidget(const ThumbnailWidget& other) { assert(false && "DONT EVER USE THIS"); } + ThumbnailWidget(const ThumbnailWidget& other) { retro_assert(false && "DONT EVER USE THIS"); } QSize sizeHint() const; void setSizeHint(QSize size);