Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UI: Reset ZIP install errors for new ZIPs.

Browse Source
This commit is contained in:
Unknown W. Brackets 2021-10-16 17:53:05 -07:00
parent 4ea1c08551
commit b0dbdb4dda
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/Util/GameManager.cpp
View File

@ -391,7 +391,6 @@ bool GameManager::DetectTexturePackDest(struct zip *z, int iniIndex, Path &dest)
void GameManager::SetInstallError(const std::string &err) {
installProgress_ = 0.0f;
installInProgress_ = false;
installError_ = err;
InstallDone();
}
@ -597,12 +596,11 @@ bool GameManager::InstallMemstickGame(struct zip *z, const Path &zipfile, const
zip_close(z);
z = nullptr;
installProgress_ = 1.0f;
installError_ = "";
if (deleteAfter) {
File::Delete(zipfile);
}
InstallDone();
installInProgress_ = false;
ResetInstallError();
return true;
bail:
@ -647,9 +645,8 @@ bool GameManager::InstallZippedISO(struct zip *z, int isoFileIndex, const Path &
z = 0;
installProgress_ = 1.0f;
installError_ = "";
InstallDone();
installInProgress_ = false;
ResetInstallError();
return true;
}
@ -670,12 +667,18 @@ bool GameManager::InstallRawISO(const Path &file, const std::string &originalNam
}
}
installProgress_ = 1.0f;
installError_ = "";
InstallDone();
installInProgress_ = false;
ResetInstallError();
return true;
}
void GameManager::ResetInstallError() {
if (!installInProgress_) {
installError_ = "";
}
}
void GameManager::InstallDone() {
installInProgress_ = false;
installDonePending_ = true;
}

1
Core/Util/GameManager.h
View File

@ -68,6 +68,7 @@ public:
float GetCurrentInstallProgressPercentage() const {
return installProgress_;
}
void ResetInstallError();
std::string GetInstallError() const {
return installError_;
}

4
UI/InstallZipScreen.cpp
View File

@ -25,6 +25,10 @@
#include "UI/InstallZipScreen.h"
#include "UI/MainScreen.h"
InstallZipScreen::InstallZipScreen(const Path &zipPath) : zipPath_(zipPath) {
g_GameManager.ResetInstallError();
}
void InstallZipScreen::CreateViews() {
using namespace UI;

2
UI/InstallZipScreen.h
View File

@ -26,7 +26,7 @@
class InstallZipScreen : public UIDialogScreenWithBackground {
public:
InstallZipScreen(const Path &zipPath) : zipPath_(zipPath) {}
InstallZipScreen(const Path &zipPath);
virtual void update() override;
virtual bool key(const KeyInput &key) override;