aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-27 20:02:12 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-27 20:02:12 +0300
commit8c607ae7348206c29a8a8ce5e2db421138bd89ff (patch)
tree72ce75ceab3ebc740a4fae21f9c3ed13875a1429 /launcher/ui
parent4036cecfc02142c403a45e18474ad7aab6fc8834 (diff)
downloadPrismLauncher-8c607ae7348206c29a8a8ce5e2db421138bd89ff.tar.gz
PrismLauncher-8c607ae7348206c29a8a8ce5e2db421138bd89ff.tar.bz2
PrismLauncher-8c607ae7348206c29a8a8ce5e2db421138bd89ff.zip
removed extra if
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/ui')
-rw-r--r--launcher/ui/pages/modplatform/ResourceModel.cpp36
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModel.cpp8
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp8
3 files changed, 20 insertions, 32 deletions
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 018721f9..cb8f1920 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -137,26 +137,22 @@ void ResourceModel::search()
if (!projectId.isEmpty()) {
ResourceAPI::ProjectInfoCallbacks callbacks;
- // Use defaults if no callbacks are set
- if (!callbacks.on_fail)
- callbacks.on_fail = [this](QString reason) {
- if (!s_running_models.constFind(this).value())
- return;
- searchRequestFailed(reason, -1);
- };
- if (!callbacks.on_abort)
- callbacks.on_abort = [this] {
- if (!s_running_models.constFind(this).value())
- return;
- searchRequestAborted();
- };
-
- if (!callbacks.on_succeed)
- callbacks.on_succeed = [this](auto& doc, auto& pack) {
- if (!s_running_models.constFind(this).value())
- return;
- searchRequestForOneSucceeded(doc);
- };
+ callbacks.on_fail = [this](QString reason) {
+ if (!s_running_models.constFind(this).value())
+ return;
+ searchRequestFailed(reason, -1);
+ };
+ callbacks.on_abort = [this] {
+ if (!s_running_models.constFind(this).value())
+ return;
+ searchRequestAborted();
+ };
+
+ callbacks.on_succeed = [this](auto& doc, auto& pack) {
+ if (!s_running_models.constFind(this).value())
+ return;
+ searchRequestForOneSucceeded(doc);
+ };
if (auto job = m_api->getProjectInfo({ projectId }, std::move(callbacks)); job)
runSearchJob(job);
return;
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index 17875a60..8875a945 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -168,12 +168,8 @@ void ListModel::performPaginatedSearch()
if (!projectId.isEmpty()) {
ResourceAPI::ProjectInfoCallbacks callbacks;
- // Use defaults if no callbacks are set
- if (!callbacks.on_fail)
- callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
-
- if (!callbacks.on_succeed)
- callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
+ callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
+ callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
static const FlameAPI api;
if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) {
jobPtr = job;
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index efb1fe44..f691a185 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -138,12 +138,8 @@ void ModpackListModel::performPaginatedSearch()
if (!projectId.isEmpty()) {
ResourceAPI::ProjectInfoCallbacks callbacks;
- // Use defaults if no callbacks are set
- if (!callbacks.on_fail)
- callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
-
- if (!callbacks.on_succeed)
- callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
+ callbacks.on_fail = [this](QString reason) { searchRequestFailed(reason); };
+ callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
static const ModrinthAPI api;
if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) {
jobPtr = job;