Fixed memleaks and incorrect add tab in ui::view_group

hrydgard · GermanAizek · commit 9c3c23daa6d3 · 2024-04-02T13:48:16.000+03:00
Signed-off-by: Herman Semenov &lt;GermanAizek@yandex.ru&gt;
diff --git a/Common/File/VFS/ZipFileReader.cpp b/Common/File/VFS/ZipFileReader.cpp
@@ -281,6 +281,7 @@ VFSOpenFile *ZipFileReader::OpenFileForRead(VFSFileReference *vfsReference, size
 	if (!openFile->zf) {
 		WARN_LOG(G3D, "File with index %d not found in zip", reference->zi);
 		lock_.unlock();
+		delete openFile;
 		return nullptr;
 	}
 
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
@@ -1395,7 +1395,7 @@ void FrameDumpTestScreen::CreateViews() {
 	LinearLayout *dumps = new LinearLayoutList(ORIENT_VERTICAL);
 	dumps->SetSpacing(0);
 	dumpsScroll->Add(dumps);
-	tabHolder->AddTab("Dumps", dumps);
+	tabHolder->AddTab("Dumps", dumpsScroll);
 
 	dumps->Add(new ItemHeader("GE Frame Dumps"));
 
@@ -1405,6 +1405,7 @@ void FrameDumpTestScreen::CreateViews() {
 		c->SetTag(url);
 		c->OnClick.Handle<FrameDumpTestScreen>(this, &FrameDumpTestScreen::OnLoadDump);
 	}
+	delete dumpsScroll;
 }
 
 UI::EventReturn FrameDumpTestScreen::OnLoadDump(UI::EventParams &params) {

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ VFSOpenFile ZipFileReader::OpenFileForRead(VFSFileReference vfsReference, size`
`281`	`281`	`if (!openFile->zf) {`
`282`	`282`	`WARN_LOG(G3D, "File with index %d not found in zip", reference->zi);`
`283`	`283`	`lock_.unlock();`
	`284`	`+ delete openFile;`
`284`	`285`	`return nullptr;`
`285`	`286`	`}`
`286`	`287`
Original file line number	Diff line number	Diff line change
`@@ -1395,7 +1395,7 @@ void FrameDumpTestScreen::CreateViews() {`
`1395`	`1395`	`LinearLayout *dumps = new LinearLayoutList(ORIENT_VERTICAL);`
`1396`	`1396`	`dumps->SetSpacing(0);`
`1397`	`1397`	`dumpsScroll->Add(dumps);`
`1398`		`- tabHolder->AddTab("Dumps", dumps);`
	`1398`	`+ tabHolder->AddTab("Dumps", dumpsScroll);`
`1399`	`1399`
`1400`	`1400`	`dumps->Add(new ItemHeader("GE Frame Dumps"));`
`1401`	`1401`
`@@ -1405,6 +1405,7 @@ void FrameDumpTestScreen::CreateViews() {`
`1405`	`1405`	`c->SetTag(url);`
`1406`	`1406`	`c->OnClick.Handle<FrameDumpTestScreen>(this, &FrameDumpTestScreen::OnLoadDump);`
`1407`	`1407`	`}`
	`1408`	`+ delete dumpsScroll;`
`1408`	`1409`	`}`
`1409`	`1410`
`1410`	`1411`	`UI::EventReturn FrameDumpTestScreen::OnLoadDump(UI::EventParams &params) {`