aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages
diff options
context:
space:
mode:
authorseth <getchoo@tuta.io>2023-06-25 21:16:18 +0000
committerGitHub <noreply@github.com>2023-06-25 21:16:18 +0000
commit903fae94be85d01efbb09f5b5f1154d8c8b76548 (patch)
treeecd29b3f77e3be0f2547048695e86081bb50372d /launcher/ui/pages
parent1bd778d0ae27b3e87b800f773d5bc35708060c19 (diff)
parent6d0e255ca18b1934d6eb514b6324cde67bb87d60 (diff)
downloadPrismLauncher-903fae94be85d01efbb09f5b5f1154d8c8b76548.tar.gz
PrismLauncher-903fae94be85d01efbb09f5b5f1154d8c8b76548.tar.bz2
PrismLauncher-903fae94be85d01efbb09f5b5f1154d8c8b76548.zip
Merge pull request #1272 from Trial97/fix_selected
fix: Page container extra info set on logs page
Diffstat (limited to 'launcher/ui/pages')
-rw-r--r--launcher/ui/pages/BasePage.h2
-rw-r--r--launcher/ui/pages/instance/ExternalResourcesPage.cpp2
2 files changed, 2 insertions, 2 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);