Skip to content

Commit 83bd9fd

Browse files
authored
Merge pull request #18950 from hrydgard/minor-ui-fixes
Fix soft-lock when loading non-existing files, fix wrong timer in MIPSDebugInterface
2 parents 14b78e5 + 3424d24 commit 83bd9fd

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Core/MIPS/MIPSDebugInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class MipsExpressionFunctions: public IExpressionFunctions
159159
return __KernelGetCurThreadModuleId();
160160
if (referenceIndex == REF_INDEX_USEC)
161161
return (uint32_t)CoreTiming::GetGlobalTimeUs(); // Loses information
162-
if (referenceIndex == REF_INDEX_USEC)
162+
if (referenceIndex == REF_INDEX_TICKS)
163163
return (uint32_t)CoreTiming::GetTicks();
164164
if ((referenceIndex & ~(REF_INDEX_FPU | REF_INDEX_FPU_INT)) < 32)
165165
return cpu->GetRegValue(1, referenceIndex & ~(REF_INDEX_FPU | REF_INDEX_FPU_INT));

UI/GameInfoCache.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -451,12 +451,11 @@ class GameInfoWorkItem : public Task {
451451
void Run() override {
452452
// An early-return will result in the destructor running, where we can set
453453
// flags like working and pending.
454-
if (!info_->CreateLoader()) {
455-
return;
456-
}
457-
458-
// In case of a remote file, check if it actually exists before locking.
459-
if (!info_->GetFileLoader() || !info_->GetFileLoader()->Exists()) {
454+
if (!info_->CreateLoader() || !info_->GetFileLoader() || !info_->GetFileLoader()->Exists()) {
455+
// Mark everything requested as done, so
456+
std::unique_lock<std::mutex> lock(info_->lock);
457+
info_->MarkReadyNoLock(flags_);
458+
ERROR_LOG(LOADER, "Failed getting game info.");
460459
return;
461460
}
462461

0 commit comments

Comments
 (0)