diff options
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/ui/pages/BasePage.h | 2 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/ExternalResourcesPage.cpp | 2 | ||||
| -rw-r--r-- | launcher/ui/widgets/PageContainer.cpp | 4 | 
3 files changed, 4 insertions, 4 deletions
| diff --git a/launcher/ui/pages/BasePage.h b/launcher/ui/pages/BasePage.h index 5537c28f..dc2bde99 100644 --- a/launcher/ui/pages/BasePage.h +++ b/launcher/ui/pages/BasePage.h @@ -44,7 +44,7 @@  class BasePage {     public: -    using updateExtraInfoFunc = std::function<void(QString)>; +    using updateExtraInfoFunc = std::function<void(QString, QString)>;      virtual ~BasePage() {}      virtual QString id() const = 0;      virtual QString displayName() const = 0; diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp index 8e5226ef..173bcb66 100644 --- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp +++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp @@ -83,7 +83,7 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared      connect(selection_model, &QItemSelectionModel::currentChanged, this, &ExternalResourcesPage::current);      auto updateExtra = [this]() {          if (updateExtraInfo) -            updateExtraInfo(extraHeaderInfoString()); +            updateExtraInfo(id(), extraHeaderInfoString());      };      connect(selection_model, &QItemSelectionModel::selectionChanged, this, updateExtra);      connect(model.get(), &ResourceFolderModel::updateFinished, this, updateExtra); diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp index 34df42ec..b98c9796 100644 --- a/launcher/ui/widgets/PageContainer.cpp +++ b/launcher/ui/widgets/PageContainer.cpp @@ -93,8 +93,8 @@ PageContainer::PageContainer(BasePageProvider *pageProvider, QString defaultId,          page->listIndex = counter;          page->setParentContainer(this);          counter++; -        page->updateExtraInfo = [this](QString info) { -            if (m_currentPage) +        page->updateExtraInfo = [this](QString id, QString info) { +            if (m_currentPage && id == m_currentPage->id())                  m_header->setText(m_currentPage->displayName() + info);          };      } | 
