From 139c35c9b938c232f5ed0768d40046b8f1f126e5 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 12 Mar 2025 08:30:22 -0400 Subject: [PATCH] ProcessController: Fix return type of UpdateSituation. fWriteMemory is an int64. --- src/apps/processcontroller/MemoryBarMenu.cpp | 2 +- src/apps/processcontroller/MemoryBarMenuItem.cpp | 2 +- src/apps/processcontroller/MemoryBarMenuItem.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/processcontroller/MemoryBarMenu.cpp b/src/apps/processcontroller/MemoryBarMenu.cpp index 0aa5b4f146..276b2f3267 100644 --- a/src/apps/processcontroller/MemoryBarMenu.cpp +++ b/src/apps/processcontroller/MemoryBarMenu.cpp @@ -86,7 +86,7 @@ MemoryBarMenu::Pulse() MemoryBarMenuItem* item; int total = 0; for (k = 1; (item = (MemoryBarMenuItem*)ItemAt(k)) != NULL; k++) { - int m = item->UpdateSituation(committedMemory); + int64 m = item->UpdateSituation(committedMemory); if (m < 0) { if (lastRecycle == fRecycleCount) { fRecycleCount += EXTRA; diff --git a/src/apps/processcontroller/MemoryBarMenuItem.cpp b/src/apps/processcontroller/MemoryBarMenuItem.cpp index 448390262f..775dcdfff5 100644 --- a/src/apps/processcontroller/MemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/MemoryBarMenuItem.cpp @@ -200,7 +200,7 @@ MemoryBarMenuItem::GetContentSize(float* _width, float* _height) } -int +int64 MemoryBarMenuItem::UpdateSituation(int64 committedMemory) { fCommittedMemory = committedMemory; diff --git a/src/apps/processcontroller/MemoryBarMenuItem.h b/src/apps/processcontroller/MemoryBarMenuItem.h index ab0b586efa..27aaa41fe9 100644 --- a/src/apps/processcontroller/MemoryBarMenuItem.h +++ b/src/apps/processcontroller/MemoryBarMenuItem.h @@ -19,7 +19,7 @@ class MemoryBarMenuItem : public IconMenuItem { virtual void GetContentSize(float* _width, float* _height); void DrawBar(bool force); - int UpdateSituation(int64 committedMemory); + int64 UpdateSituation(int64 committedMemory); void BarUpdate(); void Init(); void Reset(char* name, team_id team, BBitmap* icon, bool deleteIcon);