diff --git a/sphaira/source/ui/menus/appstore.cpp b/sphaira/source/ui/menus/appstore.cpp index 0562573..0d0b01c 100644 --- a/sphaira/source/ui/menus/appstore.cpp +++ b/sphaira/source/ui/menus/appstore.cpp @@ -527,9 +527,7 @@ auto InstallApp(ProgressBox* pbox, const Entry& entry) -> Result { continue; } - if (!unzip_to(new_entry.path, new_entry.path)) { - return false; - } + R_TRY(unzip_to(new_entry.path, new_entry.path)); } // finally finally, remove files no longer in the manifest diff --git a/sphaira/source/usb/usbds.cpp b/sphaira/source/usb/usbds.cpp index 543561b..58e8f64 100644 --- a/sphaira/source/usb/usbds.cpp +++ b/sphaira/source/usb/usbds.cpp @@ -20,7 +20,7 @@ constexpr u16 DEVICE_SPEED[] = { }; // TODO: pr this to libnx. -Result usbDsGetSpeed(u32 *out) { +Result usbDsGetSpeed(UsbDeviceSpeed *out) { if (hosversionBefore(8,0,0)) { return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); } @@ -247,7 +247,7 @@ Result UsbDs::IsUsbConnected(u64 timeout) { Result UsbDs::GetSpeed(UsbDeviceSpeed* out, u16* max_packet_size) { if (hosversionAtLeast(8,0,0)) { - R_TRY(usbDsGetSpeed((u32*)out)); + R_TRY(usbDsGetSpeed(out)); } else { // assume USB 2.0 speed (likely the case anyway). *out = UsbDeviceSpeed_High;