Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove error prone error reporting in MemStickScreen

Browse Source
This commit is contained in:
Henrik Rydgård committed 2026-05-10 23:41:39 +02:00
1 parent 7600ec42dd
commit 3de6865380
2 files changed
+3 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/MemStickScreen.cpp
+3 -7
View File
@@ -220,8 +220,6 @@ void MemStickScreen::CreateViews() {
leftColumn->Add(new RadioButton(&choice_, CHOICE_SET_MANUAL, ms->T("Manually specify PSP folder")))->OnClick.Handle(this, &MemStickScreen::OnChoiceClick); leftColumn->Add(new RadioButton(&choice_, CHOICE_SET_MANUAL, ms->T("Manually specify PSP folder")))->OnClick.Handle(this, &MemStickScreen::OnChoiceClick);
// TODO: Show current folder here if we have one set. // TODO: Show current folder here if we have one set.
} }
errorNoticeView_ = leftColumn->Add(new NoticeView(NoticeLevel::WARN, ms->T("Cancelled - try again"), ""));
errorNoticeView_->SetVisibility(UI::V_GONE);
if (choice_ == CHOICE_BROWSE_FOLDER || choice_ == CHOICE_SET_MANUAL) { if (choice_ == CHOICE_BROWSE_FOLDER || choice_ == CHOICE_SET_MANUAL) {
UI::View *extraView = nullptr; UI::View *extraView = nullptr;
@@ -419,7 +417,7 @@ void MemStickScreen::UseStorageRoot(UI::EventParams &params) {
void MemStickScreen::Browse(UI::EventParams &params) { void MemStickScreen::Browse(UI::EventParams &params) {
auto mm = GetI18NCategory(I18NCat::MAINMENU); auto mm = GetI18NCategory(I18NCat::MAINMENU);
System_BrowseForFolder(GetRequesterToken(), mm->T("Choose folder"), g_Config.memStickDirectory, [=](const std::string &value, int) { System_BrowseForFolder(GetRequesterToken(), mm->T("Choose folder"), g_Config.memStickDirectory, [this](const std::string &value, int) {
Path pendingMemStickFolder = Path(value); Path pendingMemStickFolder = Path(value);
INFO_LOG(Log::System, "Got folder: '%s' (old: %s)", pendingMemStickFolder.c_str(), g_Config.memStickDirectory.c_str()); INFO_LOG(Log::System, "Got folder: '%s' (old: %s)", pendingMemStickFolder.c_str(), g_Config.memStickDirectory.c_str());
// Browse finished. Let's pop up the confirmation dialog. // Browse finished. Let's pop up the confirmation dialog.
@@ -430,11 +428,9 @@ void MemStickScreen::Browse(UI::EventParams &params) {
done_ = true; done_ = true;
return; return;
} }
errorNoticeView_->SetVisibility(UI::V_GONE);
screenManager()->push(new ConfirmMemstickMoveScreen(pendingMemStickFolder, initialSetup_)); screenManager()->push(new ConfirmMemstickMoveScreen(pendingMemStickFolder, initialSetup_));
}, [=]() { }, [this]() {
errorNoticeView_->SetVisibility(UI::V_VISIBLE); WARN_LOG(Log::System, "Folder browse cancelled");
}); });
} }
UI/MemStickScreen.h
-2
View File
@@ -80,8 +80,6 @@ private:
void OnConfirmClick(UI::EventParams &params); void OnConfirmClick(UI::EventParams &params);
void OnChoiceClick(UI::EventParams &params); void OnChoiceClick(UI::EventParams &params);
NoticeView *errorNoticeView_ = nullptr;
bool initialSetup_; bool initialSetup_;
bool storageBrowserWorking_; bool storageBrowserWorking_;
bool done_ = false; bool done_ = false;