diff options
| author | he3als <65787561+he3als@users.noreply.github.com> | 2022-10-22 15:30:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 15:30:40 +0100 |
| commit | 89fd84d916b58cb7c82c94bcadc0834de8f5a039 (patch) | |
| tree | fae8c646ca9b35bc2499a4c39787387686ae2a91 /launcher/ui/pages/modplatform/ftb/FtbPage.cpp | |
| parent | 92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21 (diff) | |
| parent | 81f13052701dbec499ef65fe714f107a9b584ebf (diff) | |
| download | PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.gz PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.bz2 PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.zip | |
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'launcher/ui/pages/modplatform/ftb/FtbPage.cpp')
| -rw-r--r-- | launcher/ui/pages/modplatform/ftb/FtbPage.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp index 8975d74e..b08f3bc4 100644 --- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp +++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp @@ -73,6 +73,8 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent) connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FtbPage::onSortingSelectionChanged); connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FtbPage::onSelectionChanged); connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FtbPage::onVersionSelectionChanged); + + ui->packDescription->setMetaEntry("FTBPacks"); } FtbPage::~FtbPage() @@ -105,7 +107,7 @@ void FtbPage::retranslate() void FtbPage::openedImpl() { - if(!initialised) + if(!initialised || listModel->wasAborted()) { listModel->request(); initialised = true; @@ -114,6 +116,12 @@ void FtbPage::openedImpl() suggestCurrent(); } +void FtbPage::closedImpl() +{ + if (listModel->isMakingRequest()) + listModel->abortRequest(); +} + void FtbPage::suggestCurrent() { if(!isOpened) |