RSARScanner: Don't associate the sampColl with the instrSet

magcius · magcius · commit 7329d683137b · 2017-02-11T08:59:05.000-08:00
The instrSet takes ownership of the sampColl and will delete it on
destruction. The VGMColl is enough to associate the two.
diff --git a/src/main/formats/RSARScanner.cpp b/src/main/formats/RSARScanner.cpp
@@ -267,7 +267,7 @@ void RSARScanner::Scan(RawFile *file, void *info) {
     sampColl->LoadVGMFile();
     sampColls.push_back(sampColl);
 
-    VGMInstrSet *instrSet = new RSARInstrSet(file, rbnk->instr.offset, rbnk->instr.size, string2wstring(rbnk->name), sampColl);
+    VGMInstrSet *instrSet = new RSARInstrSet(file, rbnk->instr.offset, rbnk->instr.size, string2wstring(rbnk->name));
     instrSet->LoadVGMFile();
     instrSets.push_back(instrSet);
   }

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ void RSARScanner::Scan(RawFile file, void info) {`
`267`	`267`	`sampColl->LoadVGMFile();`
`268`	`268`	`sampColls.push_back(sampColl);`
`269`	`269`
`270`		`- VGMInstrSet *instrSet = new RSARInstrSet(file, rbnk->instr.offset, rbnk->instr.size, string2wstring(rbnk->name), sampColl);`
	`270`	`+ VGMInstrSet *instrSet = new RSARInstrSet(file, rbnk->instr.offset, rbnk->instr.size, string2wstring(rbnk->name));`
`271`	`271`	`instrSet->LoadVGMFile();`
`272`	`272`	`instrSets.push_back(instrSet);`
`273`	`273`	`}`