Minor commit to remove an old code that led to a crash in the new usa…

…ge of user list view (preflet), other minor edits to attempt fix for known bug.
cafeina-software · Aug 1, 2024 · 23579d1 · 23579d1
1 parent f2625c2
commit 23579d1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/application/mBackgroundView.cpp b/src/application/mBackgroundView.cpp
@@ -71,11 +71,11 @@ int mBackgroundView::CallSetBackgroundImage(void* data)
 void mBackgroundView::SetBackgroundImage(void* data)
 {
     BStringList* localList = (BStringList*)data;
-    BBitmap* nextimage = nullptr, *releaseimage = nullptr;
 
     while(!shouldExit) {
+        BBitmap* nextimage = nullptr, *releaseimage = nullptr;
         for(int i = 0; i < localList->CountStrings(); i++) {
-            nextimage = BTranslationUtils::GetBitmap(localList->StringAt(i));
+            nextimage = BTranslationUtils::GetBitmap(localList->StringAt(i).String());
 
             if(nextimage != NULL) {
                 snooze(multiplier * 1000000);

diff --git a/src/application/mSystemInfo.cpp b/src/application/mSystemInfo.cpp
@@ -125,11 +125,13 @@ void mSystemInfo::Update()
 
     LockLooper();
 
-    memmax->SetText(fStrMaxMem);
-    memused->SetText(fStrUsedMem);
-    runtime->SetText(fStrRunningTime);
+    memmax->SetText(fStrMaxMem.String());
+    memused->SetText(fStrUsedMem.String());
+    runtime->SetText(fStrRunningTime.String());
 
     UnlockLooper();
+    LockLooper();
+    UnlockLooper();
 }
 
 BStringView* mSystemInfo::AddTitle(const char* title)

diff --git a/src/preflet/mWindow.cpp b/src/preflet/mWindow.cpp
@@ -638,7 +638,7 @@ void mWindow::UpdateStrings_Thread()
     LockLooper();
 
     mAddUserName->SetText(settings->DefaultUser());
-    ((BStringView*)mListOfUsers->ItemAt(0))->SetText(settings->DefaultUser());
+    // ((BStringView*)mListOfUsers->ItemAt(0))->SetText(settings->DefaultUser());
 
     settings->BackgroundColor() = mCCBgColor->ValueAsColor();
 	settings->SetBackgroundImageFolderPath(mTextControlmPathToImageFolder->Text());