diff options
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | launcher/net/NetJob.cpp | 5 | ||||
| -rw-r--r-- | program_info/org.polymc.PolyMC.metainfo.xml.in | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26820d47..434c5775 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -249,10 +249,8 @@ jobs: cmake --install ${{ env.BUILD_DIR }} cd ${{ env.INSTALL_DIR }} - if [ "${{ matrix.msystem }}" == "mingw32" ]; then + if [ "${{ matrix.qt_ver }}" == "5" ]; then cp /mingw32/bin/libcrypto-1_1.dll /mingw32/bin/libssl-1_1.dll ./ - elif [ "${{ matrix.msystem }}" == "mingw64" ]; then - cp /mingw64/bin/libcrypto-1_1-x64.dll /mingw64/bin/libssl-1_1-x64.dll ./ fi - name: Package (Windows, portable) diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp index 20d75976..8ced1b7e 100644 --- a/launcher/net/NetJob.cpp +++ b/launcher/net/NetJob.cpp @@ -95,6 +95,11 @@ auto NetJob::abort() -> bool fullyAborted &= part->abort(); } + if (fullyAborted) + emitAborted(); + else + emitFailed(tr("Failed to abort all tasks in the NetJob!")); + return fullyAborted; } diff --git a/program_info/org.polymc.PolyMC.metainfo.xml.in b/program_info/org.polymc.PolyMC.metainfo.xml.in index db0ab882..ef5a7d93 100644 --- a/program_info/org.polymc.PolyMC.metainfo.xml.in +++ b/program_info/org.polymc.PolyMC.metainfo.xml.in @@ -28,27 +28,27 @@ <screenshots> <screenshot type="default"> <caption>The main PolyMC window</caption> - <image type="source" width="578" height="452">https://polymc.org/img/screenshots/LauncherDark.png</image> + <image type="source" width="976" height="764">https://polymc.org/img/screenshots/LauncherDark.png</image> </screenshot> <screenshot> <caption>Modpack installation</caption> - <image type="source" width="523" height="452">https://polymc.org/img/screenshots/ModpackInstallDark.png</image> + <image type="source" width="1103" height="954">https://polymc.org/img/screenshots/ModpackInstallDark.png</image> </screenshot> <screenshot> <caption>Mod installation</caption> - <image type="source" width="654" height="452">https://polymc.org/img/screenshots/ModInstallDark.png</image> + <image type="source" width="1000" height="692">https://polymc.org/img/screenshots/ModInstallDark.png</image> </screenshot> <screenshot> <caption>Mod updating</caption> - <image type="source" width="490" height="452">https://polymc.org/img/screenshots/ModUpdateDark.png</image> + <image type="source" width="930" height="858">https://polymc.org/img/screenshots/ModUpdateDark.png</image> </screenshot> <screenshot> <caption>Instance management</caption> - <image type="source" width="667" height="452">https://polymc.org/img/screenshots/PropertiesDark.png</image> + <image type="source" width="1083" height="735">https://polymc.org/img/screenshots/PropertiesDark.png</image> </screenshot> <screenshot> <caption>Cat :)</caption> - <image type="source" width="555" height="452">https://polymc.org/img/screenshots/LauncherCatDark.png</image> + <image type="source" width="931" height="759">https://polymc.org/img/screenshots/LauncherCatDark.png</image> </screenshot> </screenshots> <releases> |