diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp index cb10b37bd..23d689ab9 100644 --- a/src/core/gpu.cpp +++ b/src/core/gpu.cpp @@ -442,22 +442,22 @@ void GPU::UpdateDMARequest() { case BlitterState::Idle: m_GPUSTAT.ready_to_send_vram = false; - m_GPUSTAT.ready_to_recieve_dma = (m_fifo.IsEmpty() || m_fifo.GetSize() < m_command_total_words); + m_GPUSTAT.ready_to_receive_dma = (m_fifo.IsEmpty() || m_fifo.GetSize() < m_command_total_words); break; case BlitterState::WritingVRAM: m_GPUSTAT.ready_to_send_vram = false; - m_GPUSTAT.ready_to_recieve_dma = (m_fifo.GetSize() < m_fifo_size); + m_GPUSTAT.ready_to_receive_dma = (m_fifo.GetSize() < m_fifo_size); break; case BlitterState::ReadingVRAM: m_GPUSTAT.ready_to_send_vram = true; - m_GPUSTAT.ready_to_recieve_dma = false; + m_GPUSTAT.ready_to_receive_dma = false; break; case BlitterState::DrawingPolyLine: m_GPUSTAT.ready_to_send_vram = false; - m_GPUSTAT.ready_to_recieve_dma = (m_fifo.GetSize() < m_fifo_size); + m_GPUSTAT.ready_to_receive_dma = (m_fifo.GetSize() < m_fifo_size); break; default: @@ -473,11 +473,11 @@ void GPU::UpdateDMARequest() break; case GPUDMADirection::FIFO: - dma_request = m_GPUSTAT.ready_to_recieve_dma; + dma_request = m_GPUSTAT.ready_to_receive_dma; break; case GPUDMADirection::CPUtoGP0: - dma_request = m_GPUSTAT.ready_to_recieve_dma; + dma_request = m_GPUSTAT.ready_to_receive_dma; break; case GPUDMADirection::GPUREADtoCPU: diff --git a/src/core/gpu_types.h b/src/core/gpu_types.h index 5a8d211dd..47b3a5fca 100644 --- a/src/core/gpu_types.h +++ b/src/core/gpu_types.h @@ -205,7 +205,7 @@ union GPUSTAT BitField dma_data_request; BitField gpu_idle; BitField ready_to_send_vram; - BitField ready_to_recieve_dma; + BitField ready_to_receive_dma; BitField dma_direction; BitField display_line_lsb; diff --git a/src/duckstation-qt/gamelistwidget.cpp b/src/duckstation-qt/gamelistwidget.cpp index c147cfd37..e703b0265 100644 --- a/src/duckstation-qt/gamelistwidget.cpp +++ b/src/duckstation-qt/gamelistwidget.cpp @@ -544,23 +544,19 @@ QVariant GameListModel::data(const QModelIndex& index, int role, const GameList: case Column_Year: { - if (ge->dbentry && ge->dbentry->release_date != 0) - { - return QStringLiteral("%1").arg( - QDateTime::fromSecsSinceEpoch(static_cast(ge->dbentry->release_date), QTimeZone::utc()) - .date() - .year()); - } - else - { - return QString(); - } + if (!ge->dbentry || ge->dbentry->release_date == 0) + return {}; + + return QString::number( + QDateTime::fromSecsSinceEpoch(static_cast(ge->dbentry->release_date), QTimeZone::utc()) + .date() + .year()); } case Column_Players: { if (!ge->dbentry || ge->dbentry->min_players == 0) - return QString(); + return {}; else if (ge->dbentry->min_players == ge->dbentry->max_players) return QStringLiteral("%1").arg(ge->dbentry->min_players); else @@ -596,6 +592,9 @@ QVariant GameListModel::data(const QModelIndex& index, int role, const GameList: else return {}; } + + default: + return {}; } } @@ -651,6 +650,30 @@ QVariant GameListModel::data(const QModelIndex& index, int role, const GameList: const_cast(this)->loadOrGenerateCover(ge); return *m_cover_pixmap_cache.Insert(ge->path, m_loading_pixmap); } + + default: + return {}; + } + } + + case Qt::ToolTipRole: + { + switch (index.column()) + { + case Column_TimePlayed: + if (ge->total_played_time == 0) + return {}; + else + return QtUtils::StringViewToQString(GameList::FormatTimespan(ge->total_played_time, false)); + + case Column_LastPlayed: + if (ge->last_played_time == 0) + return {}; + else + return QtHost::FormatNumber(Host::NumberFormatType::LongDateTime, static_cast(ge->last_played_time)); + + default: + return {}; } } }