From 5b3dffce62f7e4c00436adeca33c5f2fc4a21db4 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Mon, 18 Oct 2021 00:47:02 +0200 Subject: NOISSUE continue debranding... --- launcher/updater/DownloadTask_test.cpp | 4 ++-- launcher/updater/UpdateChecker.cpp | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'launcher/updater') diff --git a/launcher/updater/DownloadTask_test.cpp b/launcher/updater/DownloadTask_test.cpp index 8d5375e8..dc263c17 100644 --- a/launcher/updater/DownloadTask_test.cpp +++ b/launcher/updater/DownloadTask_test.cpp @@ -77,7 +77,7 @@ slots: QTest::addColumn("ret"); QTest::newRow("one") - << MULTIMC_GET_TEST_FILE("data/1.json") + << GET_TEST_FILE("data/1.json") << (VersionFileList() << VersionFileEntry{"fileOne", 493, @@ -93,7 +93,7 @@ slots: "f12df554b21e320be6471d7154130e70"}) << QString() << true; QTest::newRow("two") - << MULTIMC_GET_TEST_FILE("data/2.json") + << GET_TEST_FILE("data/2.json") << (VersionFileList() << VersionFileEntry{"fileOne", 493, diff --git a/launcher/updater/UpdateChecker.cpp b/launcher/updater/UpdateChecker.cpp index eea73dcf..c96a6c9f 100644 --- a/launcher/updater/UpdateChecker.cpp +++ b/launcher/updater/UpdateChecker.cpp @@ -190,14 +190,6 @@ void UpdateChecker::updateChanList(bool notifyNoUpdate) return; } - if (m_channelUrl.isEmpty()) - { - qCritical() << "Failed to update channel list. No channel list URL set." - << "If you'd like to use MultiMC's update system, please pass the channel " - "list URL to CMake at compile time."; - return; - } - m_chanListLoading = true; NetJob *job = new NetJob("Update System Channel List"); job->addNetAction(Net::Download::makeByteArray(QUrl(m_channelUrl), &chanlistData)); -- cgit